From f45ed059725521bffd45840da12caad1117690f3 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 20 Oct 2023 12:29:58 +0200 Subject: [PATCH 01/36] added new lang file --- application/config/autoload.php | 1 + application/language/english/awards_lang.php | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 application/language/english/awards_lang.php diff --git a/application/config/autoload.php b/application/config/autoload.php index 90cf5e3e..6f8f019f 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -100,6 +100,7 @@ $autoload['language'] = array( 'account', 'adif', 'admin', + 'awards', 'contesting', 'eqsl', 'export', diff --git a/application/language/english/awards_lang.php b/application/language/english/awards_lang.php new file mode 100644 index 00000000..476e298e --- /dev/null +++ b/application/language/english/awards_lang.php @@ -0,0 +1,16 @@ +Website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location, or from locations no two of which are more than 200 kilometers apart. The applicant’s attestation in the award application serves as affirmation of abidance to the distance rule. Individuals may apply for and be granted multiple GridMaster awards, when achieved from another location, which is in a different 200-kilometer circle."; +$lang['awards_gridmaster_warning_hint'] = "This map shows only QSO worked on SAT"; + + From f453c197762d8e3322c1b227d737353df1039a25 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 20 Oct 2023 12:30:07 +0200 Subject: [PATCH 02/36] gridmaster description box --- application/views/awards/gridmaster/index.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/application/views/awards/gridmaster/index.php b/application/views/awards/gridmaster/index.php index 6caed124..b4a43157 100644 --- a/application/views/awards/gridmaster/index.php +++ b/application/views/awards/gridmaster/index.php @@ -54,6 +54,17 @@ +
+
+

+
+
+

+

+ +
+
+
From b5ba513d247e5ac7fc21759f7bb69763c61c4b98 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 20 Oct 2023 15:43:22 +0200 Subject: [PATCH 03/36] added new language --- application/language/english/awards_lang.php | 22 +++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/application/language/english/awards_lang.php b/application/language/english/awards_lang.php index 476e298e..3b1f28e9 100644 --- a/application/language/english/awards_lang.php +++ b/application/language/english/awards_lang.php @@ -2,15 +2,27 @@ defined('BASEPATH') OR exit('No direct script access allowed'); +$lang['awards_info_button'] = "Award Info"; +$lang['awards_info_title'] = "Informationen about this award"; + /* ___________________________________________________________________________________________ -US Gridmaster +US Gridmaster -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_gridmaster_what_is'] = "What is the US Gridmaster Award?"; -$lang['awards_gridmaster_description_ln1'] = "The 'GridMaster Award' is the most prestigious AMSAT award. It was first introduced in 2014 by the Star Comm Group and is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each."; -$lang['awards_gridmaster_description_ln2'] = "Official Information from the Website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location, or from locations no two of which are more than 200 kilometers apart. The applicant’s attestation in the award application serves as affirmation of abidance to the distance rule. Individuals may apply for and be granted multiple GridMaster awards, when achieved from another location, which is in a different 200-kilometer circle."; -$lang['awards_gridmaster_warning_hint'] = "This map shows only QSO worked on SAT"; +$lang['awards_gridmaster_description_ln1'] = "US Gridmaster Award"; +$lang['awards_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award. It was first introduced in 2014 by the Star Comm Group and is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each."; +$lang['awards_gridmaster_description_ln3'] = "Official Information from the Website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location, or from locations no two of which are more than 200 kilometers apart. The applicant’s attestation in the award application serves as affirmation of abidance to the distance rule. Individuals may apply for and be granted multiple GridMaster awards, when achieved from another location, which is in a different 200-kilometer circle."; +$lang['awards_gridmaster_description_ln4'] = "This map shows only QSO worked on SAT"; +/* +___________________________________________________________________________________________ +VUCC -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ +$lang['awards_vucc_description_ln1'] = "VHF/UHF Century Club Award"; +$lang['awards_vucc_description_ln2'] = "The VHF/UHF Century Club Award will be given for a minimum number of worked and confirmed gridsquares on a desired band."; +$lang['awards_vucc_description_ln3'] = "Offical Information and the Rules you can find in this document: Click me!"; +$lang['awards_vucc_description_ln4'] = "Only VHF/UHF Bands are relevant."; From 7a3002e08e9e8731e9c3f75fcb16925d8169c07f Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 20 Oct 2023 15:44:11 +0200 Subject: [PATCH 04/36] added award info box --- application/views/awards/gridmaster/index.php | 27 ++++++++++--------- application/views/awards/vucc/index.php | 16 ++++++++++- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/application/views/awards/gridmaster/index.php b/application/views/awards/gridmaster/index.php index b4a43157..0a5a1492 100644 --- a/application/views/awards/gridmaster/index.php +++ b/application/views/awards/gridmaster/index.php @@ -42,9 +42,22 @@
+
- -

+
+ +

+ +
+ session->flashdata('message')) { ?> @@ -54,16 +67,6 @@
-
-
-

-
-
-

-

- -
-
diff --git a/application/views/awards/vucc/index.php b/application/views/awards/vucc/index.php index 2c7fb7e2..2ac22e05 100644 --- a/application/views/awards/vucc/index.php +++ b/application/views/awards/vucc/index.php @@ -1,6 +1,20 @@
+ +
+
+

- + +
+ From 898396d092c79341b37ecf9ff9ba325f43bdf99e Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 20 Oct 2023 15:44:34 +0200 Subject: [PATCH 05/36] global award info box --- application/views/interface_assets/footer.php | 19 ++++++++++++++++++- assets/css/general.css | 7 +++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index a83f000f..03ac8337 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -2388,7 +2388,24 @@ function viewEqsl(picture, callsign) { }); } - + +

+ + + session->flashdata('message')) { ?> From 99a5caa9677d21e32229272ade72a0ec1fd52e98 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 20 Oct 2023 23:45:10 +0200 Subject: [PATCH 07/36] added award-info buttons with dialog --- application/views/awards/counties/index.php | 17 ++++++++- application/views/awards/cq/index.php | 17 ++++++++- application/views/awards/dok/index.php | 18 ++++++++-- application/views/awards/dxcc/index.php | 17 ++++++++- application/views/awards/ffma/index.php | 35 +++++++++---------- application/views/awards/gridmaster/index.php | 34 +++++++++--------- application/views/awards/iota/index.php | 18 ++++++++-- application/views/awards/pota/index.php | 19 ++++++++-- application/views/awards/sig/index.php | 17 ++++++++- application/views/awards/sota/index.php | 19 ++++++++-- application/views/awards/was/index.php | 18 ++++++++-- application/views/awards/wwff/index.php | 19 ++++++++-- 12 files changed, 192 insertions(+), 56 deletions(-) diff --git a/application/views/awards/counties/index.php b/application/views/awards/counties/index.php index 5017bbba..9558cf07 100644 --- a/application/views/awards/counties/index.php +++ b/application/views/awards/counties/index.php @@ -1,5 +1,20 @@
-

+ +
+
+ +

+ +
+
diff --git a/application/views/awards/cq/index.php b/application/views/awards/cq/index.php index 23c64037..dc16b804 100644 --- a/application/views/awards/cq/index.php +++ b/application/views/awards/cq/index.php @@ -33,7 +33,22 @@
-

+ +
+
+ +

+ +
+
diff --git a/application/views/awards/dok/index.php b/application/views/awards/dok/index.php index 8baabb89..a6d474e2 100644 --- a/application/views/awards/dok/index.php +++ b/application/views/awards/dok/index.php @@ -1,6 +1,20 @@
- -

+ +
+
+ +

+ +
+
diff --git a/application/views/awards/dxcc/index.php b/application/views/awards/dxcc/index.php index d2c41b97..2555f60a 100644 --- a/application/views/awards/dxcc/index.php +++ b/application/views/awards/dxcc/index.php @@ -32,7 +32,22 @@ }
-

+ +
+
+ +

+ +
+
diff --git a/application/views/awards/ffma/index.php b/application/views/awards/ffma/index.php index d9356c17..363cb80b 100644 --- a/application/views/awards/ffma/index.php +++ b/application/views/awards/ffma/index.php @@ -41,25 +41,22 @@ }
- -
- - -
-
- -

- -
- + +
+
+ +

+ +
+ session->flashdata('message')) { ?> diff --git a/application/views/awards/gridmaster/index.php b/application/views/awards/gridmaster/index.php index 90e53cc6..15b43fb7 100644 --- a/application/views/awards/gridmaster/index.php +++ b/application/views/awards/gridmaster/index.php @@ -41,24 +41,22 @@ }
- - -
-
- -

- -
- - + +
+
+ +

+ +
+ session->flashdata('message')) { ?>
diff --git a/application/views/awards/iota/index.php b/application/views/awards/iota/index.php index 52bb40a1..c16bf764 100644 --- a/application/views/awards/iota/index.php +++ b/application/views/awards/iota/index.php @@ -34,8 +34,22 @@
-

- + +
+
+ +

+ +
+
diff --git a/application/views/awards/pota/index.php b/application/views/awards/pota/index.php index d14d86fd..79340c55 100644 --- a/application/views/awards/pota/index.php +++ b/application/views/awards/pota/index.php @@ -1,7 +1,20 @@
- -

- + +
+
+ +

+ +
+ session->userdata('user_date_format')) { diff --git a/application/views/awards/sig/index.php b/application/views/awards/sig/index.php index dbc97518..dcf284cc 100644 --- a/application/views/awards/sig/index.php +++ b/application/views/awards/sig/index.php @@ -1,5 +1,20 @@
-

+ +
+
+ +

+ +
+
diff --git a/application/views/awards/sota/index.php b/application/views/awards/sota/index.php index a01d3a34..748e2d1a 100644 --- a/application/views/awards/sota/index.php +++ b/application/views/awards/sota/index.php @@ -1,7 +1,20 @@
- -

- + +
+
+ +

+ +
+ diff --git a/application/views/awards/was/index.php b/application/views/awards/was/index.php index 410d4190..f36b8dbf 100644 --- a/application/views/awards/was/index.php +++ b/application/views/awards/was/index.php @@ -1,7 +1,21 @@
-

- + +
+
+ +

+ +
+
diff --git a/application/views/awards/wwff/index.php b/application/views/awards/wwff/index.php index 7b0f75c7..e7877e18 100644 --- a/application/views/awards/wwff/index.php +++ b/application/views/awards/wwff/index.php @@ -1,7 +1,20 @@
- -

- + +
+
+ +

+ +
+ session->userdata('user_date_format')) { From 89b301b433f3bc215f03cfb8e58c90bcb1e2747d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 21 Oct 2023 00:00:57 +0200 Subject: [PATCH 08/36] made ln1 to infobox title --- application/views/awards/counties/index.php | 2 -- application/views/awards/cq/index.php | 2 -- application/views/awards/dok/index.php | 2 -- application/views/awards/dxcc/index.php | 2 -- application/views/awards/ffma/index.php | 2 -- application/views/awards/gridmaster/index.php | 2 -- application/views/awards/iota/index.php | 2 -- application/views/awards/pota/index.php | 2 -- application/views/awards/sig/index.php | 2 -- application/views/awards/sota/index.php | 2 -- application/views/awards/vucc/index.php | 2 -- application/views/awards/was/index.php | 2 -- application/views/awards/wwff/index.php | 2 -- application/views/interface_assets/footer.php | 3 +-- 14 files changed, 1 insertion(+), 28 deletions(-) diff --git a/application/views/awards/counties/index.php b/application/views/awards/counties/index.php index 9558cf07..a446daf7 100644 --- a/application/views/awards/counties/index.php +++ b/application/views/awards/counties/index.php @@ -4,8 +4,6 @@

From 770631b51cfc7108feb9bd4acbcd5812bb547277 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 23 Oct 2023 11:06:34 +0200 Subject: [PATCH 31/36] added award info box --- application/views/awards/ja_gridmaster/index.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/application/views/awards/ja_gridmaster/index.php b/application/views/awards/ja_gridmaster/index.php index 38306726..d43566bf 100644 --- a/application/views/awards/ja_gridmaster/index.php +++ b/application/views/awards/ja_gridmaster/index.php @@ -44,7 +44,20 @@
-

+ +
+
+ +

+ +
+ session->flashdata('message')) { ?> From 06bb1bd4ab843f2d0cafafea92d1b27ad4e0eb13 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 23 Oct 2023 11:06:54 +0200 Subject: [PATCH 32/36] added ja grid description --- .../language/bulgarian/awards_lang.php | 20 +++++++++++++++---- .../chinese_simplified/awards_lang.php | 20 +++++++++++++++---- application/language/czech/awards_lang.php | 20 +++++++++++++++---- application/language/dutch/awards_lang.php | 20 +++++++++++++++---- application/language/english/awards_lang.php | 20 +++++++++++++++---- application/language/finnish/awards_lang.php | 20 +++++++++++++++---- application/language/french/awards_lang.php | 20 +++++++++++++++---- application/language/german/awards_lang.php | 20 +++++++++++++++---- application/language/greek/awards_lang.php | 20 +++++++++++++++---- application/language/italian/awards_lang.php | 20 +++++++++++++++---- application/language/polish/awards_lang.php | 20 +++++++++++++++---- application/language/russian/awards_lang.php | 20 +++++++++++++++---- application/language/spanish/awards_lang.php | 20 +++++++++++++++---- application/language/swedish/awards_lang.php | 20 +++++++++++++++---- application/language/turkish/awards_lang.php | 20 +++++++++++++++---- 15 files changed, 240 insertions(+), 60 deletions(-) diff --git a/application/language/bulgarian/awards_lang.php b/application/language/bulgarian/awards_lang.php index f875d90c..d010cb3f 100644 --- a/application/language/bulgarian/awards_lang.php +++ b/application/language/bulgarian/awards_lang.php @@ -118,10 +118,22 @@ US Gridmaster -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_gridmaster_description_ln1'] = "US Gridmaster Award"; -$lang['awards_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; -$lang['awards_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; -$lang['awards_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; +$lang['awards_us_gridmaster_description_ln1'] = "US Gridmaster Award"; +$lang['awards_us_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; +$lang['awards_us_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; +$lang['awards_us_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; + + +/* +___________________________________________________________________________________________ +JA Gridmaster -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_ja_gridmaster_description_ln1'] = "JA Gridmaster Award"; +$lang['awards_ja_gridmaster_description_ln2'] = "Just as the US Gridmaster this Award is based on working all gridsquares of Japan."; +$lang['awards_ja_gridmaster_description_ln3'] = "Additional Information and the rules about this award are still pending."; +$lang['awards_ja_gridmaster_description_ln4'] = ""; /* diff --git a/application/language/chinese_simplified/awards_lang.php b/application/language/chinese_simplified/awards_lang.php index f875d90c..d010cb3f 100644 --- a/application/language/chinese_simplified/awards_lang.php +++ b/application/language/chinese_simplified/awards_lang.php @@ -118,10 +118,22 @@ US Gridmaster -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_gridmaster_description_ln1'] = "US Gridmaster Award"; -$lang['awards_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; -$lang['awards_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; -$lang['awards_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; +$lang['awards_us_gridmaster_description_ln1'] = "US Gridmaster Award"; +$lang['awards_us_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; +$lang['awards_us_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; +$lang['awards_us_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; + + +/* +___________________________________________________________________________________________ +JA Gridmaster -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_ja_gridmaster_description_ln1'] = "JA Gridmaster Award"; +$lang['awards_ja_gridmaster_description_ln2'] = "Just as the US Gridmaster this Award is based on working all gridsquares of Japan."; +$lang['awards_ja_gridmaster_description_ln3'] = "Additional Information and the rules about this award are still pending."; +$lang['awards_ja_gridmaster_description_ln4'] = ""; /* diff --git a/application/language/czech/awards_lang.php b/application/language/czech/awards_lang.php index f875d90c..d010cb3f 100644 --- a/application/language/czech/awards_lang.php +++ b/application/language/czech/awards_lang.php @@ -118,10 +118,22 @@ US Gridmaster -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_gridmaster_description_ln1'] = "US Gridmaster Award"; -$lang['awards_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; -$lang['awards_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; -$lang['awards_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; +$lang['awards_us_gridmaster_description_ln1'] = "US Gridmaster Award"; +$lang['awards_us_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; +$lang['awards_us_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; +$lang['awards_us_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; + + +/* +___________________________________________________________________________________________ +JA Gridmaster -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_ja_gridmaster_description_ln1'] = "JA Gridmaster Award"; +$lang['awards_ja_gridmaster_description_ln2'] = "Just as the US Gridmaster this Award is based on working all gridsquares of Japan."; +$lang['awards_ja_gridmaster_description_ln3'] = "Additional Information and the rules about this award are still pending."; +$lang['awards_ja_gridmaster_description_ln4'] = ""; /* diff --git a/application/language/dutch/awards_lang.php b/application/language/dutch/awards_lang.php index f875d90c..d010cb3f 100644 --- a/application/language/dutch/awards_lang.php +++ b/application/language/dutch/awards_lang.php @@ -118,10 +118,22 @@ US Gridmaster -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_gridmaster_description_ln1'] = "US Gridmaster Award"; -$lang['awards_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; -$lang['awards_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; -$lang['awards_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; +$lang['awards_us_gridmaster_description_ln1'] = "US Gridmaster Award"; +$lang['awards_us_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; +$lang['awards_us_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; +$lang['awards_us_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; + + +/* +___________________________________________________________________________________________ +JA Gridmaster -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_ja_gridmaster_description_ln1'] = "JA Gridmaster Award"; +$lang['awards_ja_gridmaster_description_ln2'] = "Just as the US Gridmaster this Award is based on working all gridsquares of Japan."; +$lang['awards_ja_gridmaster_description_ln3'] = "Additional Information and the rules about this award are still pending."; +$lang['awards_ja_gridmaster_description_ln4'] = ""; /* diff --git a/application/language/english/awards_lang.php b/application/language/english/awards_lang.php index f875d90c..d010cb3f 100644 --- a/application/language/english/awards_lang.php +++ b/application/language/english/awards_lang.php @@ -118,10 +118,22 @@ US Gridmaster -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_gridmaster_description_ln1'] = "US Gridmaster Award"; -$lang['awards_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; -$lang['awards_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; -$lang['awards_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; +$lang['awards_us_gridmaster_description_ln1'] = "US Gridmaster Award"; +$lang['awards_us_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; +$lang['awards_us_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; +$lang['awards_us_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; + + +/* +___________________________________________________________________________________________ +JA Gridmaster -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_ja_gridmaster_description_ln1'] = "JA Gridmaster Award"; +$lang['awards_ja_gridmaster_description_ln2'] = "Just as the US Gridmaster this Award is based on working all gridsquares of Japan."; +$lang['awards_ja_gridmaster_description_ln3'] = "Additional Information and the rules about this award are still pending."; +$lang['awards_ja_gridmaster_description_ln4'] = ""; /* diff --git a/application/language/finnish/awards_lang.php b/application/language/finnish/awards_lang.php index f875d90c..d010cb3f 100644 --- a/application/language/finnish/awards_lang.php +++ b/application/language/finnish/awards_lang.php @@ -118,10 +118,22 @@ US Gridmaster -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_gridmaster_description_ln1'] = "US Gridmaster Award"; -$lang['awards_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; -$lang['awards_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; -$lang['awards_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; +$lang['awards_us_gridmaster_description_ln1'] = "US Gridmaster Award"; +$lang['awards_us_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; +$lang['awards_us_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; +$lang['awards_us_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; + + +/* +___________________________________________________________________________________________ +JA Gridmaster -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_ja_gridmaster_description_ln1'] = "JA Gridmaster Award"; +$lang['awards_ja_gridmaster_description_ln2'] = "Just as the US Gridmaster this Award is based on working all gridsquares of Japan."; +$lang['awards_ja_gridmaster_description_ln3'] = "Additional Information and the rules about this award are still pending."; +$lang['awards_ja_gridmaster_description_ln4'] = ""; /* diff --git a/application/language/french/awards_lang.php b/application/language/french/awards_lang.php index f875d90c..d010cb3f 100644 --- a/application/language/french/awards_lang.php +++ b/application/language/french/awards_lang.php @@ -118,10 +118,22 @@ US Gridmaster -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_gridmaster_description_ln1'] = "US Gridmaster Award"; -$lang['awards_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; -$lang['awards_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; -$lang['awards_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; +$lang['awards_us_gridmaster_description_ln1'] = "US Gridmaster Award"; +$lang['awards_us_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; +$lang['awards_us_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; +$lang['awards_us_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; + + +/* +___________________________________________________________________________________________ +JA Gridmaster -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_ja_gridmaster_description_ln1'] = "JA Gridmaster Award"; +$lang['awards_ja_gridmaster_description_ln2'] = "Just as the US Gridmaster this Award is based on working all gridsquares of Japan."; +$lang['awards_ja_gridmaster_description_ln3'] = "Additional Information and the rules about this award are still pending."; +$lang['awards_ja_gridmaster_description_ln4'] = ""; /* diff --git a/application/language/german/awards_lang.php b/application/language/german/awards_lang.php index 47f5a397..d92859fa 100644 --- a/application/language/german/awards_lang.php +++ b/application/language/german/awards_lang.php @@ -118,10 +118,22 @@ US Gridmaster -- Verwenden Sie alle 4 Textzeilen ___________________________________________________________________________________________ */ -$lang['awards_gridmaster_description_ln1'] = "US Gridmaster Diplom"; -$lang['awards_gridmaster_description_ln2'] = "Der GridMaster Award ist die renommierteste AMSAT-Auszeichnung, die erstmals 2014 von der Star Comm Group eingeführt wurde. Sie steht allen Funkamateuren weltweit zur Verfügung, die es schaffen, alle 488 Planquadrate in den USA via Satellit zu arbeiten und für jeden Kontakt QSL-Bestätigungen vorlegen können."; -$lang['awards_gridmaster_description_ln3'] = "Offizielle Informationen von der Website: Es muss eine Zweiwegekommunikation über Amateurfunksatellit mit jedem Gitter hergestellt werden. Es ist keine Mindest-Signalreport erforderlich. Die Kontakte müssen vom selben Standort aus erfolgen oder von Standorten aus, die nicht mehr als 200 Kilometer voneinander entfernt sind. Die Aussage des Antragstellers in der Auszeichnungsanwendung dient als Bestätigung der Einhaltung der Abstandsregel. Personen können mehrere GridMaster-Auszeichnungen beantragen und erhalten, wenn sie von einem anderen Standort aus erreicht werden, der sich in einem anderen 200-Kilometer-Kreis befindet."; -$lang['awards_gridmaster_description_ln4'] = "Diese Karte zeigt nur QSOs, die über SAT gearbeitet wurden."; +$lang['awards_us_gridmaster_description_ln1'] = "US Gridmaster Diplom"; +$lang['awards_us_gridmaster_description_ln2'] = "Der GridMaster Award ist die renommierteste AMSAT-Auszeichnung, die erstmals 2014 von der Star Comm Group eingeführt wurde. Sie steht allen Funkamateuren weltweit zur Verfügung, die es schaffen, alle 488 Planquadrate in den USA via Satellit zu arbeiten und für jeden Kontakt QSL-Bestätigungen vorlegen können."; +$lang['awards_us_gridmaster_description_ln3'] = "Offizielle Informationen von der Website: Es muss eine Zweiwegekommunikation über Amateurfunksatellit mit jedem Gitter hergestellt werden. Es ist keine Mindest-Signalreport erforderlich. Die Kontakte müssen vom selben Standort aus erfolgen oder von Standorten aus, die nicht mehr als 200 Kilometer voneinander entfernt sind. Die Aussage des Antragstellers in der Auszeichnungsanwendung dient als Bestätigung der Einhaltung der Abstandsregel. Personen können mehrere GridMaster-Auszeichnungen beantragen und erhalten, wenn sie von einem anderen Standort aus erreicht werden, der sich in einem anderen 200-Kilometer-Kreis befindet."; +$lang['awards_us_gridmaster_description_ln4'] = "Diese Karte zeigt nur QSOs, die über SAT gearbeitet wurden."; + + +/* +___________________________________________________________________________________________ +JA Gridmaster -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_ja_gridmaster_description_ln1'] = "JA Gridmaster Diplom"; +$lang['awards_ja_gridmaster_description_ln2'] = "Genau wie das US Gridmaster Diplom basiert dieses Diplom auf dem Arbeiten alle Planquadrate in Japan."; +$lang['awards_ja_gridmaster_description_ln3'] = "Genaue Information und Regeln zu diesem Diplom sind noch offen, bzw. werden noch hinzugefügt."; +$lang['awards_ja_gridmaster_description_ln4'] = ""; /* diff --git a/application/language/greek/awards_lang.php b/application/language/greek/awards_lang.php index f875d90c..d010cb3f 100644 --- a/application/language/greek/awards_lang.php +++ b/application/language/greek/awards_lang.php @@ -118,10 +118,22 @@ US Gridmaster -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_gridmaster_description_ln1'] = "US Gridmaster Award"; -$lang['awards_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; -$lang['awards_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; -$lang['awards_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; +$lang['awards_us_gridmaster_description_ln1'] = "US Gridmaster Award"; +$lang['awards_us_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; +$lang['awards_us_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; +$lang['awards_us_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; + + +/* +___________________________________________________________________________________________ +JA Gridmaster -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_ja_gridmaster_description_ln1'] = "JA Gridmaster Award"; +$lang['awards_ja_gridmaster_description_ln2'] = "Just as the US Gridmaster this Award is based on working all gridsquares of Japan."; +$lang['awards_ja_gridmaster_description_ln3'] = "Additional Information and the rules about this award are still pending."; +$lang['awards_ja_gridmaster_description_ln4'] = ""; /* diff --git a/application/language/italian/awards_lang.php b/application/language/italian/awards_lang.php index f875d90c..d010cb3f 100644 --- a/application/language/italian/awards_lang.php +++ b/application/language/italian/awards_lang.php @@ -118,10 +118,22 @@ US Gridmaster -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_gridmaster_description_ln1'] = "US Gridmaster Award"; -$lang['awards_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; -$lang['awards_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; -$lang['awards_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; +$lang['awards_us_gridmaster_description_ln1'] = "US Gridmaster Award"; +$lang['awards_us_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; +$lang['awards_us_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; +$lang['awards_us_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; + + +/* +___________________________________________________________________________________________ +JA Gridmaster -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_ja_gridmaster_description_ln1'] = "JA Gridmaster Award"; +$lang['awards_ja_gridmaster_description_ln2'] = "Just as the US Gridmaster this Award is based on working all gridsquares of Japan."; +$lang['awards_ja_gridmaster_description_ln3'] = "Additional Information and the rules about this award are still pending."; +$lang['awards_ja_gridmaster_description_ln4'] = ""; /* diff --git a/application/language/polish/awards_lang.php b/application/language/polish/awards_lang.php index f875d90c..d010cb3f 100644 --- a/application/language/polish/awards_lang.php +++ b/application/language/polish/awards_lang.php @@ -118,10 +118,22 @@ US Gridmaster -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_gridmaster_description_ln1'] = "US Gridmaster Award"; -$lang['awards_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; -$lang['awards_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; -$lang['awards_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; +$lang['awards_us_gridmaster_description_ln1'] = "US Gridmaster Award"; +$lang['awards_us_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; +$lang['awards_us_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; +$lang['awards_us_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; + + +/* +___________________________________________________________________________________________ +JA Gridmaster -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_ja_gridmaster_description_ln1'] = "JA Gridmaster Award"; +$lang['awards_ja_gridmaster_description_ln2'] = "Just as the US Gridmaster this Award is based on working all gridsquares of Japan."; +$lang['awards_ja_gridmaster_description_ln3'] = "Additional Information and the rules about this award are still pending."; +$lang['awards_ja_gridmaster_description_ln4'] = ""; /* diff --git a/application/language/russian/awards_lang.php b/application/language/russian/awards_lang.php index f875d90c..d010cb3f 100644 --- a/application/language/russian/awards_lang.php +++ b/application/language/russian/awards_lang.php @@ -118,10 +118,22 @@ US Gridmaster -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_gridmaster_description_ln1'] = "US Gridmaster Award"; -$lang['awards_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; -$lang['awards_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; -$lang['awards_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; +$lang['awards_us_gridmaster_description_ln1'] = "US Gridmaster Award"; +$lang['awards_us_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; +$lang['awards_us_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; +$lang['awards_us_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; + + +/* +___________________________________________________________________________________________ +JA Gridmaster -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_ja_gridmaster_description_ln1'] = "JA Gridmaster Award"; +$lang['awards_ja_gridmaster_description_ln2'] = "Just as the US Gridmaster this Award is based on working all gridsquares of Japan."; +$lang['awards_ja_gridmaster_description_ln3'] = "Additional Information and the rules about this award are still pending."; +$lang['awards_ja_gridmaster_description_ln4'] = ""; /* diff --git a/application/language/spanish/awards_lang.php b/application/language/spanish/awards_lang.php index f875d90c..d010cb3f 100644 --- a/application/language/spanish/awards_lang.php +++ b/application/language/spanish/awards_lang.php @@ -118,10 +118,22 @@ US Gridmaster -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_gridmaster_description_ln1'] = "US Gridmaster Award"; -$lang['awards_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; -$lang['awards_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; -$lang['awards_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; +$lang['awards_us_gridmaster_description_ln1'] = "US Gridmaster Award"; +$lang['awards_us_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; +$lang['awards_us_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; +$lang['awards_us_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; + + +/* +___________________________________________________________________________________________ +JA Gridmaster -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_ja_gridmaster_description_ln1'] = "JA Gridmaster Award"; +$lang['awards_ja_gridmaster_description_ln2'] = "Just as the US Gridmaster this Award is based on working all gridsquares of Japan."; +$lang['awards_ja_gridmaster_description_ln3'] = "Additional Information and the rules about this award are still pending."; +$lang['awards_ja_gridmaster_description_ln4'] = ""; /* diff --git a/application/language/swedish/awards_lang.php b/application/language/swedish/awards_lang.php index f875d90c..d010cb3f 100644 --- a/application/language/swedish/awards_lang.php +++ b/application/language/swedish/awards_lang.php @@ -118,10 +118,22 @@ US Gridmaster -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_gridmaster_description_ln1'] = "US Gridmaster Award"; -$lang['awards_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; -$lang['awards_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; -$lang['awards_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; +$lang['awards_us_gridmaster_description_ln1'] = "US Gridmaster Award"; +$lang['awards_us_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; +$lang['awards_us_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; +$lang['awards_us_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; + + +/* +___________________________________________________________________________________________ +JA Gridmaster -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_ja_gridmaster_description_ln1'] = "JA Gridmaster Award"; +$lang['awards_ja_gridmaster_description_ln2'] = "Just as the US Gridmaster this Award is based on working all gridsquares of Japan."; +$lang['awards_ja_gridmaster_description_ln3'] = "Additional Information and the rules about this award are still pending."; +$lang['awards_ja_gridmaster_description_ln4'] = ""; /* diff --git a/application/language/turkish/awards_lang.php b/application/language/turkish/awards_lang.php index f875d90c..d010cb3f 100644 --- a/application/language/turkish/awards_lang.php +++ b/application/language/turkish/awards_lang.php @@ -118,10 +118,22 @@ US Gridmaster -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_gridmaster_description_ln1'] = "US Gridmaster Award"; -$lang['awards_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; -$lang['awards_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; -$lang['awards_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; +$lang['awards_us_gridmaster_description_ln1'] = "US Gridmaster Award"; +$lang['awards_us_gridmaster_description_ln2'] = "The GridMaster Award is the most prestigious AMSAT award, first introduced in 2014 by the Star Comm Group. It is available to all amateur radio operators worldwide who manage to work all 488 grid squares in the USA via satellite and can provide QSL confirmations for each contact."; +$lang['awards_us_gridmaster_description_ln3'] = "Official information from the website: Two-way communication must be established via amateur satellite with each grid. There is no minimum signal report required. Contacts must be made from the same location or from locations no two of which are more than 200 kilometers apart. The applicant's attestation in the award application serves as affirmation of abidance by the distance rule. Individuals may apply for and be granted multiple GridMaster awards when achieved from another location, which is in a different 200-kilometer circle."; +$lang['awards_us_gridmaster_description_ln4'] = "This map shows only QSOs worked on SAT."; + + +/* +___________________________________________________________________________________________ +JA Gridmaster -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_ja_gridmaster_description_ln1'] = "JA Gridmaster Award"; +$lang['awards_ja_gridmaster_description_ln2'] = "Just as the US Gridmaster this Award is based on working all gridsquares of Japan."; +$lang['awards_ja_gridmaster_description_ln3'] = "Additional Information and the rules about this award are still pending."; +$lang['awards_ja_gridmaster_description_ln4'] = ""; /* From 5f109619ac9e2e7ae8e07fa2a28f9900af0bb22c Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 23 Oct 2023 11:10:47 +0200 Subject: [PATCH 33/36] added missing french lang file --- application/language/french/menu_lang.php | 90 +++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 application/language/french/menu_lang.php diff --git a/application/language/french/menu_lang.php b/application/language/french/menu_lang.php new file mode 100644 index 00000000..37920641 --- /dev/null +++ b/application/language/french/menu_lang.php @@ -0,0 +1,90 @@ + Date: Mon, 23 Oct 2023 11:13:09 +0200 Subject: [PATCH 34/36] typo --- application/views/awards/ja_gridmaster/index.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/views/awards/ja_gridmaster/index.php b/application/views/awards/ja_gridmaster/index.php index d43566bf..cd897c33 100644 --- a/application/views/awards/ja_gridmaster/index.php +++ b/application/views/awards/ja_gridmaster/index.php @@ -49,10 +49,10 @@

From 2a58be38ef1f512bc6ec8a165713d69ba800a411 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 23 Oct 2023 11:14:16 +0200 Subject: [PATCH 35/36] german translation --- application/language/german/awards_lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/language/german/awards_lang.php b/application/language/german/awards_lang.php index d92859fa..09e0bcb5 100644 --- a/application/language/german/awards_lang.php +++ b/application/language/german/awards_lang.php @@ -126,7 +126,7 @@ $lang['awards_us_gridmaster_description_ln4'] = "Diese Karte zeigt nur QSOs, die /* ___________________________________________________________________________________________ -JA Gridmaster -- Use all 4 Lines of Text +JA Gridmaster -- Verwenden Sie alle 4 Textzeilen ___________________________________________________________________________________________ */ From a230c8888003cc6d62063d24cc6117abc1b7b584 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 23 Oct 2023 11:17:39 +0200 Subject: [PATCH 36/36] german translation --- application/language/german/menu_lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/language/german/menu_lang.php b/application/language/german/menu_lang.php index 6f57694e..7d91eaf0 100644 --- a/application/language/german/menu_lang.php +++ b/application/language/german/menu_lang.php @@ -41,7 +41,7 @@ $lang['menu_iota'] = 'IOTA'; $lang['menu_pota'] = 'POTA'; $lang['menu_sig'] = 'SIG'; $lang['menu_sota'] = 'SOTA'; -$lang['menu_us_counties'] = 'US Countys'; +$lang['menu_us_counties'] = 'US Counties'; $lang['menu_us_gridmaster'] = 'US Gridmaster'; $lang['menu_vucc'] = 'VUCC'; $lang['menu_was'] = 'WAS';