Skip to content

Commit

Permalink
Merge pull request #80 from mailjet/development
Browse files Browse the repository at this point in the history
Development to master
  • Loading branch information
Ferhan Ismailov authored Oct 10, 2017
2 parents ae54a59 + 4963371 commit 198d7ce
Show file tree
Hide file tree
Showing 11 changed files with 276 additions and 246 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Contributors: mailjet
Tags: email, marketing, signup, newsletter, widget, smtp, mailjet
Requires at least: 3.3.0
Tested up to: 4.8
Stable tag: 4.2.5
Stable tag: 4.2.6
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -90,6 +90,9 @@ Need help? Our multilingual support team is here to answer your questions in any

== Changelog ==

= 4.2.6 =
* Added new translations

= 4.2.5 =
* Replace site_url with home_url for subscription confirmation links

Expand Down
2 changes: 1 addition & 1 deletion api/mailjet-api-v1.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public function sendRequest($method = false, $params = array(), $request = 'GET'
curl_setopt($curl_handle, CURLOPT_USERPWD, $this->apiKey . ':' . $this->secretKey);
curl_setopt($curl_handle, CURLOPT_VERBOSE, true);
curl_setopt($curl_handle, CURLINFO_HEADER_OUT, true);
curl_setopt($curl_handle, CURLOPT_USERAGENT, 'wordpress-v1.4.2.5');
curl_setopt($curl_handle, CURLOPT_USERAGENT, 'wordpress-v1.4.2.6');

$this->_request_post = false;
if ($request == 'POST')
Expand Down
2 changes: 1 addition & 1 deletion api/mailjet-api-v3.php
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ private function sendRequest($object, $params, $method)
curl_setopt($this->_curl_handle, CURLOPT_SSL_VERIFYHOST, 2);
curl_setopt($this->_curl_handle, CURLOPT_USERPWD, $this->_apiKey.':'.$this->_secretKey);
curl_setopt($this->_curl_handle, CURLOPT_CUSTOMREQUEST, $method);
curl_setopt($this->_curl_handle, CURLOPT_USERAGENT, 'wordpress-4.2.5');
curl_setopt($this->_curl_handle, CURLOPT_USERAGENT, 'wordpress-4.2.6');

switch ($method) {
case 'GET' :
Expand Down
Binary file modified i18n/wp-mailjet-de_DE.mo
Binary file not shown.
169 changes: 88 additions & 81 deletions i18n/wp-mailjet-de_DE.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Mailjet for wordpress\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-11 16:26+0300\n"
"PO-Revision-Date: 2017-08-11 16:27+0300\n"
"POT-Creation-Date: 2017-10-10 11:27+0300\n"
"PO-Revision-Date: 2017-10-10 11:40+0300\n"
"Last-Translator: Mailjet <[email protected]>\n"
"Language-Team: Mailjet <[email protected]>\n"
"Language: de\n"
Expand All @@ -12,7 +12,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-KeywordsList: _;gettext;gettext_noop;__;_e\n"
"X-Poedit-Basepath: ..\n"
"X-Generator: Poedit 2.0.3\n"
"X-Generator: Poedit 2.0.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-SearchPath-0: .\n"

Expand Down Expand Up @@ -52,7 +52,7 @@ msgstr "Ihre Mailjet Listen und Einstellungen verwalten"
msgid "Change your mailjet settings"
msgstr "Mailjet Einstellungen "

#: mailjet-options.php:55 wp-mailjet.php:110
#: mailjet-options.php:55 wp-mailjet.php:135
msgid "Settings"
msgstr "Einstellungen "

Expand Down Expand Up @@ -205,146 +205,154 @@ msgid ""
msgstr "Senden der E-Mails durch Mailjet zulassen oder verweigern "

#: mailjet-options.php:177
msgid "Not yet subscribed, choose list and save settings"
msgid ""
"Initial sync not yet executed, choose a list and save settings to start it"
msgstr ""
"Die Erstsynchronisierung wurde noch nicht durchgeführt, wählen Sie eine "
"Liste aus und speichern Sie die Einstellungen, um sie zu starten"

#: mailjet-options.php:187
#: mailjet-options.php:195
#, php-format
msgid ""
"Choose a Mailjet contact list which you would like to subscribe your "
"Wordpress users to."
"Initial users sync is <b>%s</b>! Existing contacts subscribed to <b>%s</b> "
"on <b>%s</b>"
msgstr ""
"Die Erstsynchronisierung der Benutzer ist <b>%s</b>! Vorhandene Kontakte "
"angemeldet für <b>%s</b> am\\um <b>%s</b>"

#: mailjet-options.php:188
#, php-format
msgid "Existing contacts already subscribed to contact list: <b>%s</b>"
#: mailjet-options.php:200
msgid ""
"Choose a Mailjet contact list which you would like to subscribe your "
"Wordpress users to."
msgstr ""
"Wählen Sie eine Mailjet-Kontaktliste aus, für die Sie Ihre Wordpress-Nutzer "
"anmelden möchten."

#: mailjet-options.php:191
#: mailjet-options.php:204
msgid "Disable initial sync"
msgstr ""
msgstr "Erstsynchronisierung deaktivieren"

#: mailjet-options.php:196
#, fuzzy
#| msgid "Autosubscribe new users to this list"
#: mailjet-options.php:211
msgid "Subscribe existing users to this list"
msgstr "Neue Benutzer automatisch bei dieser Liste anmelden"
msgstr "Vorhandene Benutzer für diese Liste anmelden"

#: mailjet-options.php:199
#: mailjet-options.php:214
msgid "Disable autosubscribe"
msgstr "Automatische Anmeldung deaktivieren"

#: mailjet-options.php:204
#, fuzzy
#| msgid "Autosubscribe new users to this list"
#: mailjet-options.php:221
msgid "Auto subscribe new users to this list"
msgstr "Neue Benutzer automatisch bei dieser Liste anmelden"
msgstr "Neue Benutzer für diese Liste automatisch anmelden"

#: mailjet-options.php:208
#: mailjet-options.php:225
msgid "Subscribe Wordpress users"
msgstr ""
msgstr "Wordpress-Nutzer anmelden"

#: mailjet-options.php:221
msgid "Not yet selected, choose list and save settings"
#: mailjet-options.php:238
msgid ""
"Comment author sync not yet activated, choose a list and save settings to "
"activate it"
msgstr ""
"Die Kommentar-Autor-Synchronisierung ist noch nicht aktiviert, wählen Sie "
"eine Liste aus und speichern Sie die Einstellungen, um sie zu aktivieren"

#: mailjet-options.php:231
#: mailjet-options.php:255
#, php-format
msgid "Comment authors sync is <b>%s</b>!"
msgstr "Die Kommentar-Autor-Synchronisierung ist <b>%s</b>!"

#: mailjet-options.php:261
msgid ""
"This feature adds a \"Subscribe to our mailing list\" checkbox in the "
"\"Leave a reply\" form, so that comment authors can automatically join a "
"contact list of your choice."
msgstr ""
"Diese Funktion fügt dem Formular \"Antwort hinterlassen\" das "
"Kontrollkästchen \"Für Ihre Mailing-Liste anmelden\" hinzu, damit die "
"Kommentar-Autoren automatisch einer Kontaktliste Ihrer Wahl beitreten können."

#: mailjet-options.php:232
#, php-format
msgid "Currently selected contact list: <b>%s</b>"
msgstr ""

#: mailjet-options.php:235
#, fuzzy
#| msgid "Disable autosubscribe"
#: mailjet-options.php:265
msgid "Disable comment authors subscription"
msgstr "Automatische Anmeldung deaktivieren"
msgstr "Anmeldung von Kommentar-Autoren deaktivieren"

#: mailjet-options.php:240
#, fuzzy
#| msgid "Autosubscribe new users to this list"
#: mailjet-options.php:272
msgid "Allow comment authors to subscribe to this list"
msgstr "Neue Benutzer automatisch bei dieser Liste anmelden"
msgstr "Anmeldung von Kommentar-Autoren für diese Liste zulassen"

#: mailjet-options.php:243
#: mailjet-options.php:275
msgid "Subscribe comment authors"
msgstr ""
msgstr "Kommentar-Autor-Synchronisierung"

#: mailjet-options.php:255
#: mailjet-options.php:287
msgid "Administrator"
msgstr "Administrator"

#: mailjet-options.php:255
#: mailjet-options.php:287
msgid "User roles able to access the plugin"
msgstr "Benutzerrollen, die Zugriff auf das Plugin haben können"

#: mailjet-options.php:256
#: mailjet-options.php:288
msgid "Editor"
msgstr "Editor"

#: mailjet-options.php:257
#: mailjet-options.php:289
msgid "Author"
msgstr "Autor"

#: mailjet-options.php:258
#: mailjet-options.php:290
msgid "Contributor"
msgstr "Referent"

#: mailjet-options.php:259
#: mailjet-options.php:291
msgid "Subscriber"
msgstr "Unterzeichner"

#: mailjet-options.php:262
#: mailjet-options.php:294
msgid "Access Settings"
msgstr "Zugriffseinstellungen"

#: mailjet-options.php:264
#: mailjet-options.php:296
msgid ""
"Select which WordPress admin user roles (in addition to Administrator) will "
"also have access to the Mailjet Plug-in"
msgstr ""
"Stellen Sie die Benutzerrollen ein, die Zugriff auf das Mailjet Plugin haben "
"können"

#: mailjet-options.php:419
#: mailjet-options.php:468
msgid ""
"Please make sure that you are using the correct API key and secret key "
"associated to your mailjet account (from email)."
msgstr ""
"Vergewissern Sie sich, dass Sie den richtigen API-Schlüssel und den zu Ihrem "
"Mailjet Konto gehörigen Geheimschlüssel (aus dem E-Mail) verwenden."

#: mailjet-options.php:434
#: mailjet-options.php:483
msgid "Your test mail from Mailjet"
msgstr "Ihre Test E-Mail von Mailjet "

#: mailjet-options.php:435
#: mailjet-options.php:484
#, fuzzy, php-format
msgid "Your Mailjet configuration is ok!SSL: %s Port: %s"
msgstr "Ihre Mailjet Einstellungen sind in Ordnung "

#: mailjet-options.php:444
#: mailjet-options.php:493
msgid " and your test message was sent."
msgstr " und Ihre Test E-Mail wurde versendet. "

#: mailjet-options.php:451 mailjet-options.php:453
#: mailjet-options.php:500 mailjet-options.php:502
msgid "Your settings have been saved successfully"
msgstr "Ihre Einstellungen wurden erfolgreich gespeichert"

#: mailjet-options.php:455
#: mailjet-options.php:504
msgid ""
"Your settings have been saved, but your port and SSL settings were changed "
"as follows to ensure delivery"
msgstr ""
"Ihre Einstellungen wurden gespeichert, aber Ihr Port und Ihre SSL-"
"Einstellungen wurden wie folgt geändert, um die Lieferung zu gewährleisten"

#: mailjet-options.php:465
#: mailjet-options.php:514
#, php-format
msgid ""
"Please verify that you have entered your API and secret key correctly. If "
Expand All @@ -358,7 +366,7 @@ msgstr ""
"target=\"_blank\">%s</a>) um einen neuen Geheimschlüssel für das Plug-in zu "
"erstellen."

#: mailjet-options.php:469
#: mailjet-options.php:518
msgid "There is an error with your settings. please correct and try again"
msgstr ""
"Es gibt ein Problem mit Ihren Einstellungen. Bitte überprüfen Sie diese und "
Expand All @@ -377,42 +385,42 @@ msgid ""
"widget by clicking on \"Next\" button and complete step2 and step3."
msgstr ""

#: mailjet-widget.php:434 wp-mailjet.php:195 wp-mailjet.php:270
#: mailjet-widget.php:434 wp-mailjet.php:211 wp-mailjet.php:286
msgid "Invalid email"
msgstr ""

#: mailjet-widget.php:445 mailjet-widget.php:558 mailjet-widget.php:566
#: mailjet-widget.php:445
#, php-format
msgid "The contact %s is already subscribed"
msgstr ""

#: mailjet-widget.php:482 wp-mailjet.php:276
#: mailjet-widget.php:482 wp-mailjet.php:292
msgid "Confirm your mailing list subscription"
msgstr ""

#: mailjet-widget.php:483 wp-mailjet.php:277
#: mailjet-widget.php:483 wp-mailjet.php:293
msgid "Please Confirm Your Subscription To"
msgstr ""

#: mailjet-widget.php:486 wp-mailjet.php:280
#: mailjet-widget.php:486 wp-mailjet.php:296
msgid "Click here to confirm"
msgstr ""

#: mailjet-widget.php:487 wp-mailjet.php:281
#: mailjet-widget.php:487 wp-mailjet.php:297
msgid "You may copy/paste this link into your browser:"
msgstr ""

#: mailjet-widget.php:489 wp-mailjet.php:283
#: mailjet-widget.php:489 wp-mailjet.php:299
msgid ""
"Did not ask to subscribe to this list? Or maybe you have changed your mind? "
"Then simply ignore this email and you will not be subscribed"
msgstr ""

#: mailjet-widget.php:490 wp-mailjet.php:284
#: mailjet-widget.php:490 wp-mailjet.php:300
msgid "Thanks,"
msgstr ""

#: mailjet-widget.php:496 wp-mailjet.php:290
#: mailjet-widget.php:496 wp-mailjet.php:306
msgid "Subscription Confirmation"
msgstr ""

Expand All @@ -426,20 +434,25 @@ msgstr ""
msgid "Error. Token verification failed."
msgstr ""

#: mailjet-widget.php:562
#: mailjet-widget.php:555 wp-mailjet.php:244
#, php-format
msgid "Thanks for subscribing with %s"
msgstr ""

#: mailjet-widget.php:641
#: mailjet-widget.php:628
msgid "[email protected]"
msgstr ""

#: view/options-form.php:51
msgid "Save options"
msgstr "Speicher Optionen"

#: wp-mailjet.php:83
#: wp-mailjet.php:58
msgid ""
"Mailjet plugin requires PHP 5.3 to function properly. Please upgrade PHP"
msgstr ""

#: wp-mailjet.php:108
#, php-format
msgid ""
"The mailjet plugin is enabled but your credentials are not set. Please <a "
Expand All @@ -453,20 +466,14 @@ msgstr ""
"versenden</a>um Ihre E-Mails jetzt via <b>Mailjet</b> zu versenden<a href="
"\"%1$s\" style=\"display:block; float:right;\">Nachricht überspringen</a>"

#: wp-mailjet.php:138 wp-mailjet.php:141
msgid "Subscribe"
msgstr "Abonieren"

#: wp-mailjet.php:165
#: wp-mailjet.php:163 wp-mailjet.php:181
msgid "Subscribe to our mailing list"
msgstr "Abonnieren Sie unsere Mailingliste"

#: wp-mailjet.php:228
#: wp-mailjet.php:253
#, php-format
msgid "Thanks for subscribing with %s to contact list %s"
msgid "The contact %s is unsubscribed"
msgstr ""

#: wp-mailjet.php:237
#, php-format
msgid "The contact %s is removed from contact list %s"
msgstr ""
#~ msgid "Subscribe"
#~ msgstr "Abonieren"
Binary file modified i18n/wp-mailjet-es_ES.mo
Binary file not shown.
Loading

0 comments on commit 198d7ce

Please sign in to comment.