Merge pull request #322 from annando/1511-pumpio-timeout

Pumpio: Improved Timeout check

diff --git a/buffer/lang/it/messages.po b/buffer/lang/it/messages.po
index 9c32a13..05f973d 100644 (file)
--- a/buffer/lang/it/messages.po
+++ b/buffer/lang/it/messages.po
@@ -5,14 +5,15 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014
+# Sandro Santilli <strk@keybit.net>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-22 13:18+0200\n"
-"PO-Revision-Date: 2014-09-10 10:27+0000\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
+"PO-Revision-Date: 2015-11-01 11:05+0000\n"
+"Last-Translator: Sandro Santilli <strk@keybit.net>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -69,7 +70,7 @@ msgstr "Invia sempre a Buffer"
 
 #: buffer.php:156
 msgid "Check to delete this preset"
-msgstr "Seleziona per elimiare queto preset"
+msgstr "Seleziona per eliminare questo preset"
 
 #: buffer.php:165
 msgid "Posts are going to all accounts that are enabled by default:"

diff --git a/buffer/lang/it/strings.php b/buffer/lang/it/strings.php
index 4ae16d2..9081af8 100644 (file)
--- a/buffer/lang/it/strings.php
+++ b/buffer/lang/it/strings.php
@@ -17,5 +17,5 @@ $a->strings["Buffer Export"] = "Esporta Buffer";
 $a->strings["Authenticate your Buffer connection"] = "Autentica la tua connessione a Buffer";
 $a->strings["Enable Buffer Post Plugin"] = "Abilita il plugin di invio a Buffer";
 $a->strings["Post to Buffer by default"] = "Invia sempre a Buffer";
-$a->strings["Check to delete this preset"] = "Seleziona per elimiare queto preset";
+$a->strings["Check to delete this preset"] = "Seleziona per eliminare questo preset";
 $a->strings["Posts are going to all accounts that are enabled by default:"] = "I messaggi andranno a tutti gli account che sono abilitati:";

diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 3203fec..b0e5e12 100644 (file)
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -46,7 +46,7 @@ function ifttt_settings(&$a,&$s) {
         $s .= '</span>';
 
         $s .= '<div id="ifttt-configuration-wrapper">';
-       $s .= '<p>'.t("Create an account at <a href='http://www.ifttt.com'>IFTTT</a>. Create three Facebook recipes that are connected with 'Maker' with the following parameters:").'</p>';
+       $s .= '<p>'.t("Create an account at <a href='http://www.ifttt.com'>IFTTT</a>. Create three Facebook recipes that are connected with <a href='https://ifttt.com/maker'>Maker</a> (In the form 'if Facebook then Maker') with the following parameters:").'</p>';
        $s .= '<h4>URL</h4>';
        $s .= '<p>'.$a->get_baseurl()."/ifttt/".'</p>';
        $s .= '<h4>Method</h4>';

diff --git a/mailstream/templates/settings.tpl b/mailstream/templates/settings.tpl
index 8729b7b..bd24e38 100644 (file)
--- a/mailstream/templates/settings.tpl
+++ b/mailstream/templates/settings.tpl
@@ -1,10 +1,10 @@
-{{*
- *     AUTOMATICALLY GENERATED TEMPLATE
- *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="settings-block">
+<span id="settings_mailstream_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_mailstream_expanded'); openClose('settings_mailstream_inflated');">
+<h3>{{$title}}</h3>
+</span>
+<div id="settings_mailstream_expanded" class="settings-block" style="display: none;">
+<span class="fakelink" onclick="openClose('settings_mailstream_expanded'); openClose('settings_mailstream_inflated');">
   <h3>{{$title}}</h3>
+  </span>
 {{include file="field_input.tpl" field=$address}}
 {{include file="field_checkbox.tpl" field=$enabled}}
   <input type="submit" value="{{$submit}}">