Merge remote-tracking branch 'origin/dev' into dev

application/locale/nl_NL/LC_MESSAGES/messages.po

@@ -130,7 +130,9 @@ msgstr ""
 #: application/controllers/Webadif.php:11
 #: application/controllers/Webadif.php:101
 #: application/controllers/Zonechecker.php:17
-#: application/models/Club_model.php:52
+#: application/models/Club_model.php:52 application/controllers/Lotw.php:410
+#: application/controllers/Lotw.php:433 application/controllers/Lotw.php:797
+#: application/controllers/Lotw.php:884
 msgid "You're not allowed to do that!"
 msgstr "Je mag dat niet doen!"
 
@@ -1987,11 +1989,11 @@ msgstr "Certificaat geïmporteerd."
 msgid "Certificate Updated."
 msgstr "Certificaat bijgewerkt."
 
-#: application/controllers/Lotw.php:420
+#: application/controllers/Lotw.php:420 application/controllers/Lotw.php:416
 msgid "Certificate Deleted."
 msgstr "Certificaat verwijderd."
 
-#: application/controllers/Lotw.php:448
+#: application/controllers/Lotw.php:448 application/controllers/Lotw.php:444
 #, php-format
 msgid ""
 "The certificate found in file %s contains a password and cannot be "
@@ -2004,7 +2006,7 @@ msgstr ""
 "zonder wachtwoord exporteert!%s Voor meer informatie bezoek de %sLoTW FAQ-"
 "pagina%s in de Wavelog Wiki."
 
-#: application/controllers/Lotw.php:450
+#: application/controllers/Lotw.php:450 application/controllers/Lotw.php:446
 #, php-format
 msgid ""
 "Generic error extracting the certificate from file %s. If the filename "
@@ -2015,52 +2017,52 @@ msgstr ""
 "bestandsnaam 'key-only' bevat, is dit meestal een certificaataanvraag die "
 "nog niet door LoTW is verwerkt."
 
-#: application/controllers/Lotw.php:457
+#: application/controllers/Lotw.php:457 application/controllers/Lotw.php:453
 #, php-format
 msgid "Generic error processing the certificate in file %s."
 msgstr "Generieke fout bij het verwerken van het certificaat in bestand %s."
 
-#: application/controllers/Lotw.php:469
+#: application/controllers/Lotw.php:469 application/controllers/Lotw.php:465
 #, php-format
 msgid "Generic error extracting the private key from certificate in file %s."
 msgstr ""
 "Algemene fout bij het extraheren van de privésleutel uit certificaat in "
 "bestand %s."
 
-#: application/controllers/Lotw.php:685
+#: application/controllers/Lotw.php:685 application/controllers/Lotw.php:681
 msgid "LoTW ADIF Information"
 msgstr "LoTW ADIF Informatie"
 
-#: application/controllers/Lotw.php:858
+#: application/controllers/Lotw.php:858 application/controllers/Lotw.php:854
 msgid "Connection to LoTW failed."
 msgstr "Verbinding met LoTW mislukt."
 
-#: application/controllers/Lotw.php:863
+#: application/controllers/Lotw.php:863 application/controllers/Lotw.php:859
 #, php-format
 msgid "LoTW login failed for user %s: %s."
 msgstr "LoTW-login mislukt voor gebruiker %s: %s."
 
-#: application/controllers/Lotw.php:863
+#: application/controllers/Lotw.php:863 application/controllers/Lotw.php:859
 msgid "Username/password incorrect"
 msgstr "Gebruikersnaam/wachtwoord onjuist"
 
-#: application/controllers/Lotw.php:866
+#: application/controllers/Lotw.php:866 application/controllers/Lotw.php:862
 msgid "LoTW currently not available. Try again later."
 msgstr "LoTW momenteel niet beschikbaar. Probeer het later opnieuw."
 
-#: application/controllers/Lotw.php:870
+#: application/controllers/Lotw.php:870 application/controllers/Lotw.php:866
 msgid "LoTW login OK!"
 msgstr "LoTW login oké!"
 
-#: application/controllers/Lotw.php:876
+#: application/controllers/Lotw.php:876 application/controllers/Lotw.php:872
 msgid "No LoTW credentials provided."
 msgstr "Geen LoTW-gegevens verstrekt."
 
-#: application/controllers/Lotw.php:894
+#: application/controllers/Lotw.php:894 application/controllers/Lotw.php:890
 msgid "LoTW ADIF Import"
 msgstr "LoTW ADIF importeren"
 
-#: application/controllers/Lotw.php:920
+#: application/controllers/Lotw.php:920 application/controllers/Lotw.php:916
 msgid "You have not defined your ARRL LoTW credentials!"
 msgstr "Je hebt je ARRL LoTW-gegevens niet gedefinieerd!"