script: remove option script.scripts.url_force_https, use HTTPS by default in option script.scripts.url (issue #253)

23 files changed, 141 insertions, 227 deletions

diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 280c3be77..d64d7a16f 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -38,6 +38,7 @@ Improvements::
   * irc: send multiple masks by message in commands /ban, /unban, /quiet and /unquiet, use ban mask default for nicks in /quiet and /unquiet, display an error if /quiet and /unquiet are not supported by server (issue #579, issue #15, issue #577)
   * irc: add option "-include" in commands /allchan, /allpv and /allserv (issue #572)
   * irc: don't smart filter modes given to you (issue #530, issue #897)
+  * script: remove option script.scripts.url_force_https, use HTTPS by default in option script.scripts.url
 
 Bug fixes::
 
diff --git a/doc/de/autogen/user/script_options.adoc b/doc/de/autogen/user/script_options.adoc
index 303e64778..0f55c12f6 100644
--- a/doc/de/autogen/user/script_options.adoc
+++ b/doc/de/autogen/user/script_options.adoc
@@ -237,13 +237,7 @@
 ** Standardwert: `+"%h/script"+`
 
 * [[option_script.scripts.url]] *script.scripts.url*
-** Beschreibung: pass:none[URL mit dem Dateinamen, welches die Liste der Skripten enthält; standardmäßig wird HTTPS genutzt, siehe Option script.scripts.url_force_https]
+** Beschreibung: pass:none[URL for file with list of scripts]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
-** Standardwert: `+"http://weechat.org/files/plugins.xml.gz"+`
-
-* [[option_script.scripts.url_force_https]] *script.scripts.url_force_https*
-** Beschreibung: pass:none[HTTPS wird für das Herunterladen der Indexdatei und der Skripten bevorzugt; diese Einstellung sollte nur deaktiviert werden falls Probleme beim Herunterladen auftreten]
-** Typ: boolesch
-** Werte: on, off
-** Standardwert: `+on+`
+** Standardwert: `+"https://weechat.org/files/plugins.xml.gz"+`
diff --git a/doc/en/autogen/user/script_options.adoc b/doc/en/autogen/user/script_options.adoc
index 122b9768f..ce23b0272 100644
--- a/doc/en/autogen/user/script_options.adoc
+++ b/doc/en/autogen/user/script_options.adoc
@@ -237,13 +237,7 @@
 ** default value: `+"%h/script"+`
 
 * [[option_script.scripts.url]] *script.scripts.url*
-** description: pass:none[URL for file with list of scripts; by default HTTPS is forced, see option script.scripts.url_force_https]
+** description: pass:none[URL for file with list of scripts]
 ** type: string
 ** values: any string
-** default value: `+"http://weechat.org/files/plugins.xml.gz"+`
-
-* [[option_script.scripts.url_force_https]] *script.scripts.url_force_https*
-** description: pass:none[force use of HTTPS for downloads (index and scripts); you should disable this option only if you have problems with the downloads]
-** type: boolean
-** values: on, off
-** default value: `+on+`
+** default value: `+"https://weechat.org/files/plugins.xml.gz"+`
diff --git a/doc/fr/autogen/user/script_options.adoc b/doc/fr/autogen/user/script_options.adoc
index 84f0df7b1..19658c412 100644
--- a/doc/fr/autogen/user/script_options.adoc
+++ b/doc/fr/autogen/user/script_options.adoc
@@ -237,13 +237,7 @@
 ** valeur par défaut: `+"%h/script"+`
 
 * [[option_script.scripts.url]] *script.scripts.url*
-** description: pass:none[URL pour le fichier avec la liste des scripts ; par défaut HTTPS est forcé, voir l'option script.scripts.url_force_https]
+** description: pass:none[URL pour le fichier avec la liste des scripts]
 ** type: chaîne
 ** valeurs: toute chaîne
-** valeur par défaut: `+"http://weechat.org/files/plugins.xml.gz"+`
-
-* [[option_script.scripts.url_force_https]] *script.scripts.url_force_https*
-** description: pass:none[forcer l'utilisation de HTTPS pour les téléchargements (index et scripts) ; vous ne devriez désactiver cette option que si vous avez des problèmes avec les téléchargements]
-** type: booléen
-** valeurs: on, off
-** valeur par défaut: `+on+`
+** valeur par défaut: `+"https://weechat.org/files/plugins.xml.gz"+`
diff --git a/doc/it/autogen/user/script_options.adoc b/doc/it/autogen/user/script_options.adoc
index 01860fe15..fb2a484cc 100644
--- a/doc/it/autogen/user/script_options.adoc
+++ b/doc/it/autogen/user/script_options.adoc
@@ -237,13 +237,7 @@
 ** valore predefinito: `+"%h/script"+`
 
 * [[option_script.scripts.url]] *script.scripts.url*
-** descrizione: pass:none[URL for file with list of scripts; by default HTTPS is forced, see option script.scripts.url_force_https]
+** descrizione: pass:none[URL for file with list of scripts]
 ** tipo: stringa
 ** valori: qualsiasi stringa
-** valore predefinito: `+"http://weechat.org/files/plugins.xml.gz"+`
-
-* [[option_script.scripts.url_force_https]] *script.scripts.url_force_https*
-** descrizione: pass:none[force use of HTTPS for downloads (index and scripts); you should disable this option only if you have problems with the downloads]
-** tipo: bool
-** valori: on, off
-** valore predefinito: `+on+`
+** valore predefinito: `+"https://weechat.org/files/plugins.xml.gz"+`
diff --git a/doc/ja/autogen/user/script_options.adoc b/doc/ja/autogen/user/script_options.adoc
index ec6482313..744c69906 100644
--- a/doc/ja/autogen/user/script_options.adoc
+++ b/doc/ja/autogen/user/script_options.adoc
@@ -237,13 +237,7 @@
 ** デフォルト値: `+"%h/script"+`
 
 * [[option_script.scripts.url]] *script.scripts.url*
-** 説明: pass:none[スクリプトのリストを含むファイルの URL; デフォルトは強制的に HTTPS を使用、オプション script.scripts.url_force_https を参照]
+** 説明: pass:none[URL for file with list of scripts]
 ** タイプ: 文字列
 ** 値: 未制約文字列
-** デフォルト値: `+"http://weechat.org/files/plugins.xml.gz"+`
-
-* [[option_script.scripts.url_force_https]] *script.scripts.url_force_https*
-** 説明: pass:none[ダウンロード (インデックスおよびスクリプト) の際に HTTPS を使うことを強制する; ダウンロードに問題がある場合のみこのオプションを無効化してください]
-** タイプ: ブール
-** 値: on, off
-** デフォルト値: `+on+`
+** デフォルト値: `+"https://weechat.org/files/plugins.xml.gz"+`
diff --git a/doc/pl/autogen/user/script_options.adoc b/doc/pl/autogen/user/script_options.adoc
index bb85e1089..5e732e262 100644
--- a/doc/pl/autogen/user/script_options.adoc
+++ b/doc/pl/autogen/user/script_options.adoc
@@ -237,13 +237,7 @@
 ** domyślna wartość: `+"%h/script"+`
 
 * [[option_script.scripts.url]] *script.scripts.url*
-** opis: pass:none[adres pliku z listą skryptów; domyśłnie wymuszany jest protokół HTTPS, zobacz opcje script.scripts.url_force_https]
+** opis: pass:none[URL for file with list of scripts]
 ** typ: ciąg
 ** wartości: dowolny ciąg
-** domyślna wartość: `+"http://weechat.org/files/plugins.xml.gz"+`
-
-* [[option_script.scripts.url_force_https]] *script.scripts.url_force_https*
-** opis: pass:none[wymusza użycie HTTPS do pobierania (listy i skryptów); powinieneś wyłączyć tą opcję tylko jeśli występują problemy z pobieraniem]
-** typ: bool
-** wartości: on, off
-** domyślna wartość: `+on+`
+** domyślna wartość: `+"https://weechat.org/files/plugins.xml.gz"+`
diff --git a/po/cs.po b/po/cs.po
index c34468c87..759749039 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-21 21:58+0200\n"
+"POT-Creation-Date: 2017-04-23 14:09+0200\n"
 "PO-Revision-Date: 2017-01-06 21:59+0100\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10724,15 +10724,9 @@ msgid ""
 "upgraded and can not be removed, for example: \"buffers.pl,iset.pl\""
 msgstr ""
 
-msgid ""
-"URL for file with list of scripts; by default HTTPS is forced, see option "
-"script.scripts.url_force_https"
-msgstr ""
-
-msgid ""
-"force use of HTTPS for downloads (index and scripts); you should disable "
-"this option only if you have problems with the downloads"
-msgstr ""
+#, fuzzy
+msgid "URL for file with list of scripts"
+msgstr "%s: stahuji seznam skriptů..."
 
 #, fuzzy
 msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
diff --git a/po/de.po b/po/de.po
index 685971465..5d13d5322 100644
--- a/po/de.po
+++ b/po/de.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-21 21:58+0200\n"
+"POT-Creation-Date: 2017-04-23 14:09+0200\n"
 "PO-Revision-Date: 2017-04-21 21:58+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -12304,20 +12304,9 @@ msgstr ""
 "getrennte Liste von Skripten die weder aktualisiert noch entfernt werden "
 "können. Zum Beispiel: \"buffers.pl,iset.pl\""
 
-msgid ""
-"URL for file with list of scripts; by default HTTPS is forced, see option "
-"script.scripts.url_force_https"
-msgstr ""
-"URL mit dem Dateinamen, welches die Liste der Skripten enthält; "
-"standardmäßig wird HTTPS genutzt, siehe Option script.scripts.url_force_https"
-
-msgid ""
-"force use of HTTPS for downloads (index and scripts); you should disable "
-"this option only if you have problems with the downloads"
-msgstr ""
-"HTTPS wird für das Herunterladen der Indexdatei und der Skripten bevorzugt; "
-"diese Einstellung sollte nur deaktiviert werden falls Probleme beim "
-"Herunterladen auftreten"
+#, fuzzy
+msgid "URL for file with list of scripts"
+msgstr "%s%s: die Liste der Skripten kann nicht gelesen werden"
 
 msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
@@ -13372,6 +13361,22 @@ msgstr ""
 "%s%s: Verbindung konnte nicht hergestellt werden: unerwarteter Fehler (%d)"
 
 #~ msgid ""
+#~ "URL for file with list of scripts; by default HTTPS is forced, see option "
+#~ "script.scripts.url_force_https"
+#~ msgstr ""
+#~ "URL mit dem Dateinamen, welches die Liste der Skripten enthält; "
+#~ "standardmäßig wird HTTPS genutzt, siehe Option script.scripts."
+#~ "url_force_https"
+
+#~ msgid ""
+#~ "force use of HTTPS for downloads (index and scripts); you should disable "
+#~ "this option only if you have problems with the downloads"
+#~ msgstr ""
+#~ "HTTPS wird für das Herunterladen der Indexdatei und der Skripten "
+#~ "bevorzugt; diese Einstellung sollte nur deaktiviert werden falls Probleme "
+#~ "beim Herunterladen auftreten"
+
+#~ msgid ""
 #~ "conditions to display a buffer (note: content is evaluated, see /help "
 #~ "buflist)"
 #~ msgstr ""
diff --git a/po/es.po b/po/es.po
index efb14adb2..3d5f37125 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-21 21:58+0200\n"
+"POT-Creation-Date: 2017-04-23 14:09+0200\n"
 "PO-Revision-Date: 2017-01-06 22:01+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10979,15 +10979,9 @@ msgid ""
 "upgraded and can not be removed, for example: \"buffers.pl,iset.pl\""
 msgstr ""
 
-msgid ""
-"URL for file with list of scripts; by default HTTPS is forced, see option "
-"script.scripts.url_force_https"
-msgstr ""
-
-msgid ""
-"force use of HTTPS for downloads (index and scripts); you should disable "
-"this option only if you have problems with the downloads"
-msgstr ""
+#, fuzzy
+msgid "URL for file with list of scripts"
+msgstr "%s%s: error al leer la lista de scripts"
 
 #, fuzzy
 msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
diff --git a/po/fr.po b/po/fr.po
index 7423351be..508b499c5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-21 21:58+0200\n"
-"PO-Revision-Date: 2017-04-21 21:58+0200\n"
+"POT-Creation-Date: 2017-04-23 14:09+0200\n"
+"PO-Revision-Date: 2017-04-23 14:10+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -12033,20 +12033,8 @@ msgstr ""
 "seront jamais mis à jour et ne peuvent pas être supprimés, par exemple : "
 "\"buffers.pl,iset.pl\""
 
-msgid ""
-"URL for file with list of scripts; by default HTTPS is forced, see option "
-"script.scripts.url_force_https"
-msgstr ""
-"URL pour le fichier avec la liste des scripts ; par défaut HTTPS est forcé, "
-"voir l'option script.scripts.url_force_https"
-
-msgid ""
-"force use of HTTPS for downloads (index and scripts); you should disable "
-"this option only if you have problems with the downloads"
-msgstr ""
-"forcer l'utilisation de HTTPS pour les téléchargements (index et scripts) ; "
-"vous ne devriez désactiver cette option que si vous avez des problèmes avec "
-"les téléchargements"
+msgid "URL for file with list of scripts"
+msgstr "URL pour le fichier avec la liste des scripts"
 
 msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
@@ -13103,6 +13091,21 @@ msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s : impossible de se connecter : erreur inattendue (%d)"
 
 #~ msgid ""
+#~ "URL for file with list of scripts; by default HTTPS is forced, see option "
+#~ "script.scripts.url_force_https"
+#~ msgstr ""
+#~ "URL pour le fichier avec la liste des scripts ; par défaut HTTPS est "
+#~ "forcé, voir l'option script.scripts.url_force_https"
+
+#~ msgid ""
+#~ "force use of HTTPS for downloads (index and scripts); you should disable "
+#~ "this option only if you have problems with the downloads"
+#~ msgstr ""
+#~ "forcer l'utilisation de HTTPS pour les téléchargements (index et "
+#~ "scripts) ; vous ne devriez désactiver cette option que si vous avez des "
+#~ "problèmes avec les téléchargements"
+
+#~ msgid ""
 #~ "conditions to display a buffer (note: content is evaluated, see /help "
 #~ "buflist)"
 #~ msgstr ""
diff --git a/po/hu.po b/po/hu.po
index bb88657d7..44acbb22c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-21 21:58+0200\n"
+"POT-Creation-Date: 2017-04-23 14:09+0200\n"
 "PO-Revision-Date: 2017-01-06 22:03+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10009,15 +10009,9 @@ msgid ""
 "upgraded and can not be removed, for example: \"buffers.pl,iset.pl\""
 msgstr ""
 
-msgid ""
-"URL for file with list of scripts; by default HTTPS is forced, see option "
-"script.scripts.url_force_https"
-msgstr ""
-
-msgid ""
-"force use of HTTPS for downloads (index and scripts); you should disable "
-"this option only if you have problems with the downloads"
-msgstr ""
+#, fuzzy
+msgid "URL for file with list of scripts"
+msgstr "%s adatküldési hiba az IRC szerveren\n"
 
 msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 9a6bdd941..767a1e5d3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-21 21:58+0200\n"
+"POT-Creation-Date: 2017-04-23 14:09+0200\n"
 "PO-Revision-Date: 2017-01-06 22:04+0100\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -11192,15 +11192,9 @@ msgid ""
 "upgraded and can not be removed, for example: \"buffers.pl,iset.pl\""
 msgstr ""
 
-msgid ""
-"URL for file with list of scripts; by default HTTPS is forced, see option "
-"script.scripts.url_force_https"
-msgstr ""
-
-msgid ""
-"force use of HTTPS for downloads (index and scripts); you should disable "
-"this option only if you have problems with the downloads"
-msgstr ""
+#, fuzzy
+msgid "URL for file with list of scripts"
+msgstr "%s%s: errore durante la lettura dell'elenco degli script"
 
 #, fuzzy
 msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
diff --git a/po/ja.po b/po/ja.po
index a8c057b24..5d7dd3f2e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-21 21:58+0200\n"
+"POT-Creation-Date: 2017-04-23 14:09+0200\n"
 "PO-Revision-Date: 2017-04-23 09:00+0900\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -11582,19 +11582,9 @@ msgstr ""
 "れるスクリプトはアップグレードされませんし、削除もされません、例: \"buffers."
 "pl,iset.pl\""
 
-msgid ""
-"URL for file with list of scripts; by default HTTPS is forced, see option "
-"script.scripts.url_force_https"
-msgstr ""
-"スクリプトのリストを含むファイルの URL; デフォルトは強制的に HTTPS を使用、オ"
-"プション script.scripts.url_force_https を参照"
-
-msgid ""
-"force use of HTTPS for downloads (index and scripts); you should disable "
-"this option only if you have problems with the downloads"
-msgstr ""
-"ダウンロード (インデックスおよびスクリプト) の際に HTTPS を使うことを強制す"
-"る; ダウンロードに問題がある場合のみこのオプションを無効化してください"
+#, fuzzy
+msgid "URL for file with list of scripts"
+msgstr "%s%s: スクリプトリストの読み込み中にエラー"
 
 msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
@@ -12597,6 +12587,20 @@ msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: 接続できません: 未定義のエラー (%d)"
 
 #~ msgid ""
+#~ "URL for file with list of scripts; by default HTTPS is forced, see option "
+#~ "script.scripts.url_force_https"
+#~ msgstr ""
+#~ "スクリプトのリストを含むファイルの URL; デフォルトは強制的に HTTPS を使"
+#~ "用、オプション script.scripts.url_force_https を参照"
+
+#~ msgid ""
+#~ "force use of HTTPS for downloads (index and scripts); you should disable "
+#~ "this option only if you have problems with the downloads"
+#~ msgstr ""
+#~ "ダウンロード (インデックスおよびスクリプト) の際に HTTPS を使うことを強制"
+#~ "する; ダウンロードに問題がある場合のみこのオプションを無効化してください"
+
+#~ msgid ""
 #~ "conditions to display a buffer (note: content is evaluated, see /help "
 #~ "buflist)"
 #~ msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 45b688597..8c5f64732 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-21 21:58+0200\n"
+"POT-Creation-Date: 2017-04-23 14:09+0200\n"
 "PO-Revision-Date: 2017-04-08 14:49+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -11720,19 +11720,9 @@ msgstr ""
 "nigdy nie zostaną zaktualizowane i nie mogą być usunięte, na przykład: "
 "\"buffers.pl,iset.pl\""
 
-msgid ""
-"URL for file with list of scripts; by default HTTPS is forced, see option "
-"script.scripts.url_force_https"
-msgstr ""
-"adres pliku z listą skryptów; domyśłnie wymuszany jest protokół HTTPS, "
-"zobacz opcje script.scripts.url_force_https"
-
-msgid ""
-"force use of HTTPS for downloads (index and scripts); you should disable "
-"this option only if you have problems with the downloads"
-msgstr ""
-"wymusza użycie HTTPS do pobierania (listy i skryptów); powinieneś wyłączyć "
-"tą opcję tylko jeśli występują problemy z pobieraniem"
+#, fuzzy
+msgid "URL for file with list of scripts"
+msgstr "%s%s: błąd podczas odczytywania listy skryptów"
 
 msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
@@ -12752,6 +12742,20 @@ msgstr "%s%s: przekroczono czas na \"%s\" z %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: nie można połączyć: niespodziewany błąd (%d)"
 
+#~ msgid ""
+#~ "URL for file with list of scripts; by default HTTPS is forced, see option "
+#~ "script.scripts.url_force_https"
+#~ msgstr ""
+#~ "adres pliku z listą skryptów; domyśłnie wymuszany jest protokół HTTPS, "
+#~ "zobacz opcje script.scripts.url_force_https"
+
+#~ msgid ""
+#~ "force use of HTTPS for downloads (index and scripts); you should disable "
+#~ "this option only if you have problems with the downloads"
+#~ msgstr ""
+#~ "wymusza użycie HTTPS do pobierania (listy i skryptów); powinieneś "
+#~ "wyłączyć tą opcję tylko jeśli występują problemy z pobieraniem"
+
 #, fuzzy
 #~ msgid ""
 #~ "conditions to display a buffer (note: content is evaluated, see /help "
diff --git a/po/pt.po b/po/pt.po
index fbb619d41..ea902c487 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-21 21:58+0200\n"
+"POT-Creation-Date: 2017-04-23 14:09+0200\n"
 "PO-Revision-Date: 2017-04-08 14:50+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -11719,19 +11719,9 @@ msgstr ""
 "scripts a \"reter\": lista de scripts que nunca serão atualizados e não "
 "podem ser removidos, por exemplo: \"buffers.pl,iset.pl\""
 
-msgid ""
-"URL for file with list of scripts; by default HTTPS is forced, see option "
-"script.scripts.url_force_https"
-msgstr ""
-"URL do ficheiro com a lista de scripts; por omissão é forçado HTTPS, ver a "
-"opção script.scripts.url_force_https"
-
-msgid ""
-"force use of HTTPS for downloads (index and scripts); you should disable "
-"this option only if you have problems with the downloads"
-msgstr ""
-"forçar uso de HTTPS para transferir (índice e scripts); deve desativar esta "
-"opção apenas se tem problemas com as transferências"
+#, fuzzy
+msgid "URL for file with list of scripts"
+msgstr "%s%s: erro ao ler a lista de scripts"
 
 msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
@@ -12762,6 +12752,20 @@ msgstr "%s%s: tempo limite de \"%s\" com %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: não foi possível conectar: erro inesperado (%d)"
 
+#~ msgid ""
+#~ "URL for file with list of scripts; by default HTTPS is forced, see option "
+#~ "script.scripts.url_force_https"
+#~ msgstr ""
+#~ "URL do ficheiro com a lista de scripts; por omissão é forçado HTTPS, ver "
+#~ "a opção script.scripts.url_force_https"
+
+#~ msgid ""
+#~ "force use of HTTPS for downloads (index and scripts); you should disable "
+#~ "this option only if you have problems with the downloads"
+#~ msgstr ""
+#~ "forçar uso de HTTPS para transferir (índice e scripts); deve desativar "
+#~ "esta opção apenas se tem problemas com as transferências"
+
 #, fuzzy
 #~ msgid ""
 #~ "conditions to display a buffer (note: content is evaluated, see /help "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6d802066a..271eefe4f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-21 21:58+0200\n"
+"POT-Creation-Date: 2017-04-23 14:09+0200\n"
 "PO-Revision-Date: 2016-09-03 08:24+0200\n"
 "Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10480,15 +10480,9 @@ msgid ""
 "upgraded and can not be removed, for example: \"buffers.pl,iset.pl\""
 msgstr ""
 
-msgid ""
-"URL for file with list of scripts; by default HTTPS is forced, see option "
-"script.scripts.url_force_https"
-msgstr ""
-
-msgid ""
-"force use of HTTPS for downloads (index and scripts); you should disable "
-"this option only if you have problems with the downloads"
-msgstr ""
+#, fuzzy
+msgid "URL for file with list of scripts"
+msgstr "%s%s: erro ao criar transferência"
 
 #, fuzzy
 msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
diff --git a/po/ru.po b/po/ru.po
index c74bd5cfc..37d2d0378 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-21 21:58+0200\n"
+"POT-Creation-Date: 2017-04-23 14:09+0200\n"
 "PO-Revision-Date: 2017-01-06 22:06+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10045,15 +10045,9 @@ msgid ""
 "upgraded and can not be removed, for example: \"buffers.pl,iset.pl\""
 msgstr ""
 
-msgid ""
-"URL for file with list of scripts; by default HTTPS is forced, see option "
-"script.scripts.url_force_https"
-msgstr ""
-
-msgid ""
-"force use of HTTPS for downloads (index and scripts); you should disable "
-"this option only if you have problems with the downloads"
-msgstr ""
+#, fuzzy
+msgid "URL for file with list of scripts"
+msgstr "%s ошибка при отправке данных IRC серверу\n"
 
 msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 45e7f15c4..0b1e97e06 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-21 21:58+0200\n"
+"POT-Creation-Date: 2017-04-23 14:09+0200\n"
 "PO-Revision-Date: 2017-01-06 22:07+0100\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9091,15 +9091,9 @@ msgid ""
 "upgraded and can not be removed, for example: \"buffers.pl,iset.pl\""
 msgstr ""
 
-msgid ""
-"URL for file with list of scripts; by default HTTPS is forced, see option "
-"script.scripts.url_force_https"
-msgstr ""
-
-msgid ""
-"force use of HTTPS for downloads (index and scripts); you should disable "
-"this option only if you have problems with the downloads"
-msgstr ""
+#, fuzzy
+msgid "URL for file with list of scripts"
+msgstr "betiklerin listesi"
 
 msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
 msgstr ""
diff --git a/po/weechat.pot b/po/weechat.pot
index 65f3f1e61..207d67f36 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-21 21:58+0200\n"
+"POT-Creation-Date: 2017-04-23 14:09+0200\n"
 "PO-Revision-Date: 2014-08-16 10:27+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9007,14 +9007,7 @@ msgid ""
 "upgraded and can not be removed, for example: \"buffers.pl,iset.pl\""
 msgstr ""
 
-msgid ""
-"URL for file with list of scripts; by default HTTPS is forced, see option "
-"script.scripts.url_force_https"
-msgstr ""
-
-msgid ""
-"force use of HTTPS for downloads (index and scripts); you should disable "
-"this option only if you have problems with the downloads"
+msgid "URL for file with list of scripts"
 msgstr ""
 
 msgid "script name with extension (wildcard \"*\" is allowed) (optional)"
diff --git a/src/plugins/script/script-config.c b/src/plugins/script/script-config.c
index 67ca82fce..418bc1e52 100644
--- a/src/plugins/script/script-config.c
+++ b/src/plugins/script/script-config.c
@@ -86,7 +86,6 @@ struct t_config_option *script_config_scripts_download_timeout;
 struct t_config_option *script_config_scripts_path;
 struct t_config_option *script_config_scripts_hold;
 struct t_config_option *script_config_scripts_url;
-struct t_config_option *script_config_scripts_url_force_https;
 
 
 /*
@@ -760,17 +759,8 @@ script_config_init ()
     script_config_scripts_url = weechat_config_new_option (
         script_config_file, ptr_section,
         "url", "string",
-        N_("URL for file with list of scripts; by default HTTPS is forced, "
-           "see option script.scripts.url_force_https"),
-        NULL, 0, 0, "http://weechat.org/files/plugins.xml.gz", NULL, 0,
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-    script_config_scripts_url_force_https = weechat_config_new_option (
-        script_config_file, ptr_section,
-        "url_force_https", "boolean",
-        N_("force use of HTTPS for downloads (index and scripts); "
-           "you should disable this option only if you have problems with "
-           "the downloads"),
-        NULL, 0, 0, "on", NULL, 0,
+        N_("URL for file with list of scripts"),
+        NULL, 0, 0, "https://weechat.org/files/plugins.xml.gz", NULL, 0,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
     return 1;
diff --git a/src/plugins/script/script-config.h b/src/plugins/script/script-config.h
index 9e0e45a69..c078271ab 100644
--- a/src/plugins/script/script-config.h
+++ b/src/plugins/script/script-config.h
@@ -66,7 +66,6 @@ extern struct t_config_option *script_config_scripts_download_timeout;
 extern struct t_config_option *script_config_scripts_path;
 extern struct t_config_option *script_config_scripts_hold;
 extern struct t_config_option *script_config_scripts_url;
-extern struct t_config_option *script_config_scripts_url_force_https;
 
 extern const char *script_config_get_diff_command ();
 extern char *script_config_get_xml_filename ();
diff --git a/src/plugins/script/script.c b/src/plugins/script/script.c
index 43fc248e5..48d68eff5 100644
--- a/src/plugins/script/script.c
+++ b/src/plugins/script/script.c
@@ -100,9 +100,6 @@ script_language_search_by_extension (const char *extension)
 /*
  * Builds download URL (to use with hook_process or hook_process_hashtable).
  *
- * If the option script.scripts.url_force_https is enabled, the protocol is
- * forced to HTTPS (if URL starts with "http://").
- *
  * Note: result must be freed after use.
  */
 
@@ -115,21 +112,13 @@ script_build_download_url (const char *url)
     if (!url || !url[0])
         return NULL;
 
-    /* length of url + "url:" + 1 (for httpS) */
-    length = 4 + 1 + strlen (url) + 1;
+    /* length of url + "url:" */
+    length = 4 + strlen (url) + 1;
     result = malloc (length);
     if (!result)
         return NULL;
 
-    if (weechat_config_boolean (script_config_scripts_url_force_https)
-        && (weechat_strncasecmp (url, "http://", 7) == 0))
-    {
-        snprintf (result, length, "url:https://%s", url + 7);
-    }
-    else
-    {
-        snprintf (result, length, "url:%s", url);
-    }
+    snprintf (result, length, "url:%s", url);
 
     return result;
 }