...
 
Commits (3)
......@@ -30,7 +30,7 @@ from weechat.common.path import repo_path_join
class Version(models.Model):
"""Version of a Debian repository (codename + version).
Examples: (wheezy, stable), (jessie, testing), (sid, unstable), ...
Examples: (wheezy, stable), (jessie, testing), (sid, unstable), etc.
"""
codename = models.CharField(max_length=64, primary_key=True)
version = models.CharField(max_length=64)
......
......@@ -43,8 +43,8 @@ class Task(models.Model):
def __str__(self):
desc = (self.description
if len(self.description) < 100
else '%s...' % self.description[0:100])
return '%s%s%s, %s, %d%%, %s: %s (%d)' % (
else u'%s…' % self.description[0:100])
return u'%s%s%s, %s, %d%%, %s: %s (%d)' % (
'' if self.visible else '(',
self.version,
'' if self.visible else ')',
......
......@@ -23,10 +23,11 @@
import re
from django.core.exceptions import ObjectDoesNotExist
from django.http import HttpResponse
from django.shortcuts import render
from django.utils.translation import ugettext_lazy
from django.utils.translation import ugettext, ugettext_lazy
from weechat.common.path import files_path_join
from weechat.common.path import files_path_join, media_path_join
from weechat.common.templatetags.version import version_as_int
from weechat.dev.models import Task
from weechat.download.models import Release
......@@ -73,12 +74,39 @@ INFO_KEYS = (
ugettext_lazy('Approximate date of next stable version '
'(format: "YYYY-MM-DD").'),
),
(
'release_signing_fingerprint',
ugettext_lazy('Release signing key fingerprint '
'(format: PGP fingerprint).'),
),
(
'release_signing_key',
ugettext_lazy('Release signing key (format: PGP public key).'),
),
(
'debian_repository_signing_fingerprint',
ugettext_lazy('Debian/Ubuntu repository signing key fingerprint '
'(format: PGP fingerprint).'),
),
(
'debian_repository_signing_key',
ugettext_lazy('Debian/Ubuntu repository signing key '
'(format: PGP public key).'),
),
(
'all',
ugettext_lazy('All infos (one info by line, format: "info:value").'),
ugettext_lazy('All non-binary infos '
'(one info by line, format: "info:value").'),
),
)
BINARY_INFO_KEYS = ('release_signing_key', 'debian_repository_signing_key')
PGP_KEYS = {
'release_signing': 'A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8',
'debian_repository_signing': '11E9DE8848F2B65222AA75B8D1820DB22A11534E'
}
def roadmap(request, allversions=False):
"""Page with roadmap for future or all versions."""
......@@ -198,10 +226,22 @@ def get_info(name, version):
return version_as_int(version['devel'].description)
elif name == 'next_stable_date':
return str(version['devel'].date)
elif name == 'release_signing_fingerprint':
return PGP_KEYS['release_signing']
elif name == 'debian_repository_signing_fingerprint':
return PGP_KEYS['debian_repository_signing']
elif name == 'release_signing_key':
fingerprint = PGP_KEYS['release_signing']
with open(media_path_join('pgp', fingerprint), 'rb') as _file:
return _file.read()
elif name == 'debian_repository_signing_key':
fingerprint = PGP_KEYS['debian_repository_signing']
with open(media_path_join('pgp', fingerprint), 'rb') as _file:
return _file.read()
elif name == 'all':
infos = []
for key in INFO_KEYS:
if key[0] != name:
if key[0] != name and key[0] not in BINARY_INFO_KEYS:
infos.append('%s:%s' % (key[0], get_info(key[0], version)))
return '\n'.join(infos)
return ''
......@@ -223,17 +263,27 @@ def info(request, name=None):
},
)
if name:
return render(
request,
'dev/info.html',
{
'info': get_info(name, version),
},
)
if name in BINARY_INFO_KEYS:
response = HttpResponse(get_info(name, version),
content_type='application/octet-stream')
response['Content-Disposition'] = (
'attachment; filename="weechat_%s.pgp"' % name)
return response
else:
return render(
request,
'dev/info.html',
{
'info': get_info(name, version),
},
)
else:
infos = []
for oneinfo in INFO_KEYS:
value = get_info(oneinfo[0], version)
if oneinfo[0] in BINARY_INFO_KEYS:
value = ugettext('(binary data)')
else:
value = get_info(oneinfo[0], version)
if oneinfo[0].endswith('_number'):
value = '%s (0x%08lx)' % (value, value)
infos.append((oneinfo[0], value, oneinfo[1]))
......
......@@ -67,7 +67,7 @@ class Release(models.Model):
class Type(models.Model):
"""A type of package (source, debian, ...)."""
"""A type of package (source, debian, etc.)."""
type = models.CharField(max_length=64, primary_key=True)
priority = models.IntegerField(default=0)
description = models.CharField(max_length=256)
......
......@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat.org\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-15 10:12+0100\n"
"PO-Revision-Date: 2018-12-07 18:50+0100\n"
"POT-Creation-Date: 2018-12-26 17:58+0100\n"
"PO-Revision-Date: 2018-12-26 16:25+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n"
"Language: de\n"
......@@ -192,38 +192,38 @@ msgstr ""
msgid "This field is required."
msgstr "Dieser Eintrag ist notwendig."
#: dev/views.py:37
#: dev/views.py:38
msgid "Stable version."
msgstr "stabile Version."
#: dev/views.py:41
#: dev/views.py:42
msgid ""
"Stable version, as number, like plugin API: info_get(\"version_number\")."
msgstr ""
"stabile Version, als Nummer, siehe Erweiterung-API: info_get(\"version_number"
"\")."
#: dev/views.py:46
#: dev/views.py:47
msgid "Date of stable version (format: \"YYYY-MM-DD\")."
msgstr "Datum der stabilen Version (Format: \"YYYY-MM-DD\")."
#: dev/views.py:50
#: dev/views.py:51
msgid "Development version."
msgstr "Entwicklerversion."
#: dev/views.py:54
#: dev/views.py:55
msgid "Output of \"git rev-parse HEAD\" for sources repository."
msgstr "Ausgabe von \"git rev-parse HEAD\" für Quelltext Repository."
#: dev/views.py:59
#: dev/views.py:60
msgid "Output of \"git rev-parse HEAD\" for scripts repository."
msgstr "Ausgabe von \"git rev-parse HEAD\" für Skripten Repository."
#: dev/views.py:64
#: dev/views.py:65
msgid "Next stable version."
msgstr "kommende stabile Version."
#: dev/views.py:68
#: dev/views.py:69
msgid ""
"Next stable version, as number, like plugin API: info_get(\"version_number"
"\")."
......@@ -231,17 +231,40 @@ msgstr ""
"kommende stabile Version, als Nummer, siehe Erweiterung-API: "
"info_get(\"version_number\")."
#: dev/views.py:73
#: dev/views.py:74
msgid "Approximate date of next stable version (format: \"YYYY-MM-DD\")."
msgstr ""
"voraussichtliches Datum der kommenden stabilen Version (Format: \"YYYY-MM-DD"
"\")."
#: dev/views.py:78
msgid "All infos (one info by line, format: \"info:value\")."
#: dev/views.py:79
msgid "Release signing key fingerprint (format: PGP fingerprint)."
msgstr ""
#: dev/views.py:84
msgid "Release signing key (format: PGP public key)."
msgstr ""
#: dev/views.py:88
msgid ""
"Debian/Ubuntu repository signing key fingerprint (format: PGP fingerprint)."
msgstr ""
#: dev/views.py:93
msgid "Debian/Ubuntu repository signing key (format: PGP public key)."
msgstr ""
#: dev/views.py:98
#, fuzzy
#| msgid "All infos (one info by line, format: \"info:value\")."
msgid "All non-binary infos (one info by line, format: \"info:value\")."
msgstr ""
"alle Informationen (eine Information pro Zeile, Format: \"Info:Wert\")."
#: dev/views.py:284
msgid "(binary data)"
msgstr ""
#: doc/_i18n_security.py:8
msgid "/set irc.network.colors_receive off"
msgstr "/set irc.network.colors_receive off"
......@@ -5529,7 +5552,9 @@ msgid "License"
msgstr "Lizenz"
#: scripts/models.py:292
msgid "The license (for example: GPL3, BSD, ...)."
#, fuzzy
#| msgid "The license (for example: GPL3, BSD, ...)."
msgid "The license (for example: GPL3, BSD, etc.)."
msgstr "Lizenzen (zum Beispiel: GPL3, BSD, ...)."
#: scripts/models.py:295 scripts/models.py:374
......@@ -5603,8 +5628,8 @@ msgstr ""
"Ziffern oder \"_\")."
#: scripts/models.py:351 themes/models.py:209
msgid "Choose..."
msgstr "Auswählen..."
msgid "Choose"
msgstr "Auswählen"
#: scripts/models.py:366 templates/scripts/source.html:14
msgid "Script"
......@@ -5637,8 +5662,8 @@ msgid "Error 403"
msgstr "Fehler 403"
#: templates/403.html:10
msgid "Oh no! This page is forbidden..."
msgstr "Entschuldigung, aber diese Seite ist nicht zulässig..."
msgid "Oh no! This page is forbidden"
msgstr "Entschuldigung, aber diese Seite ist nicht zulässig"
#: templates/403.html:12
msgid "You're looking where you shouldn't? ;)"
......@@ -5653,8 +5678,8 @@ msgid "Error 404"
msgstr "Fehler 404"
#: templates/404.html:10
msgid "Oh no! This page does not exist..."
msgstr "Diese Seite existiert nicht..."
msgid "Oh no! This page does not exist"
msgstr "Diese Seite existiert nicht"
#: templates/404.html:12
msgid ""
......@@ -5794,6 +5819,10 @@ msgstr "IRC Proxy und Remote-Oberfläche"
msgid "Scripts manager"
msgstr "Skripten-Manager"
#: templates/about/features.html:52
msgid "Alias, aspell, charset, logger, etc."
msgstr ""
#: templates/about/features.html:68
msgid "The future is now!"
msgstr "Die Zukunft ist da!"
......@@ -6211,7 +6240,9 @@ msgid "send a mail to the list"
msgstr "sende eine Mail an die Mailingliste"
#: templates/about/support.html:101
msgid "<strong>weechat-support</strong> (installation, usage, bugs, ...):"
#, fuzzy
#| msgid "<strong>weechat-support</strong> (installation, usage, bugs, ...):"
msgid "<strong>weechat-support</strong> (installation, usage, bugs, etc.):"
msgstr ""
"<strong>weechat-support</strong> (Installation, Anwendung, Fehler, ...):"
......@@ -7350,9 +7381,9 @@ msgstr "Versenden"
#: templates/scripts/add_error.html:12 templates/scripts/update_error.html:12
#: templates/themes/add_error.html:12 templates/themes/update_error.html:12
msgid "Oops... Something went wrong while processing the form :("
msgid "Oops Something went wrong while processing the form :("
msgstr ""
"Hups... Irgendwas lief ordentlich schief, während das Formular bearbeitet "
"Hups Irgendwas lief ordentlich schief, während das Formular bearbeitet "
"wurde :("
#: templates/scripts/add_error.html:14 templates/scripts/update_error.html:14
......
......@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat.org\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-15 10:12+0100\n"
"PO-Revision-Date: 2018-12-15 10:12+0100\n"
"POT-Creation-Date: 2018-12-26 17:58+0100\n"
"PO-Revision-Date: 2018-12-26 18:00+0100\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: French <flashcode@flashtux.org>\n"
"Language: fr\n"
......@@ -185,38 +185,38 @@ msgstr ""
msgid "This field is required."
msgstr "Ce champ est obligatoire."
#: dev/views.py:37
#: dev/views.py:38
msgid "Stable version."
msgstr "Version stable."
#: dev/views.py:41
#: dev/views.py:42
msgid ""
"Stable version, as number, like plugin API: info_get(\"version_number\")."
msgstr ""
"Version stable, sous forme de nombre, comme l'API extension : "
"info_get(\"version_number\")."
#: dev/views.py:46
#: dev/views.py:47
msgid "Date of stable version (format: \"YYYY-MM-DD\")."
msgstr "Date de la version stable (format : \"YYYY-MM-DD\")."
#: dev/views.py:50
#: dev/views.py:51
msgid "Development version."
msgstr "Version de développement."
#: dev/views.py:54
#: dev/views.py:55
msgid "Output of \"git rev-parse HEAD\" for sources repository."
msgstr "Sortie de \"git rev-parse HEAD\" pour le dépôt des sources."
#: dev/views.py:59
#: dev/views.py:60
msgid "Output of \"git rev-parse HEAD\" for scripts repository."
msgstr "Sortie de \"git rev-parse HEAD\" pour le dépôt des scripts."
#: dev/views.py:64
#: dev/views.py:65
msgid "Next stable version."
msgstr "Prochaine version stable."
#: dev/views.py:68
#: dev/views.py:69
msgid ""
"Next stable version, as number, like plugin API: info_get(\"version_number"
"\")."
......@@ -224,14 +224,39 @@ msgstr ""
"Prochaine version stable, sous forme de nombre, comme l'API extension : "
"info_get(\"version_number\")."
#: dev/views.py:73
#: dev/views.py:74
msgid "Approximate date of next stable version (format: \"YYYY-MM-DD\")."
msgstr ""
"Date approximative de la prochaine version stable (format : \"YYYY-MM-DD\")."
#: dev/views.py:78
msgid "All infos (one info by line, format: \"info:value\")."
msgstr "Toutes les infos (une info par ligne, format : \"info:valeur\")."
#: dev/views.py:79
msgid "Release signing key fingerprint (format: PGP fingerprint)."
msgstr ""
"Fingerprint de la clé de signature des versions (format : fingerprint PGP)."
#: dev/views.py:84
msgid "Release signing key (format: PGP public key)."
msgstr "Clé de signature de version (format : clé publique PGP)."
#: dev/views.py:88
msgid ""
"Debian/Ubuntu repository signing key fingerprint (format: PGP fingerprint)."
msgstr ""
"Fingerprint de la clé de signature des dépôts Debian/Ubuntu (format : "
"fingerprint PGP)."
#: dev/views.py:93
msgid "Debian/Ubuntu repository signing key (format: PGP public key)."
msgstr "Clé de signature des dépôts Debian/Ubuntu (format : clé publique PGP)."
#: dev/views.py:98
msgid "All non-binary infos (one info by line, format: \"info:value\")."
msgstr ""
"Toutes les infos non binaires (une info par ligne, format : \"info:valeur\")."
#: dev/views.py:284
msgid "(binary data)"
msgstr "(données binaires)"
#: doc/_i18n_security.py:8
msgid "/set irc.network.colors_receive off"
......@@ -5474,8 +5499,8 @@ msgid "License"
msgstr "Licence"
#: scripts/models.py:292
msgid "The license (for example: GPL3, BSD, ...)."
msgstr "La licence (par exemple : GPL3, BSD, ...)."
msgid "The license (for example: GPL3, BSD, etc.)."
msgstr "La licence (par exemple : GPL3, BSD, etc.)."
#: scripts/models.py:295 scripts/models.py:374
#: templates/doc/doc_version.html:67 themes/models.py:138 themes/models.py:227
......@@ -5548,8 +5573,8 @@ msgstr ""
"minuscules, chiffres ou \"_\")."
#: scripts/models.py:351 themes/models.py:209
msgid "Choose..."
msgstr "Choisissez..."
msgid "Choose"
msgstr "Choisissez"
#: scripts/models.py:366 templates/scripts/source.html:14
msgid "Script"
......@@ -5582,8 +5607,8 @@ msgid "Error 403"
msgstr "Erreur 403"
#: templates/403.html:10
msgid "Oh no! This page is forbidden..."
msgstr "Oh non ! Cette page est interdite..."
msgid "Oh no! This page is forbidden"
msgstr "Oh non ! Cette page est interdite"
#: templates/403.html:12
msgid "You're looking where you shouldn't? ;)"
......@@ -5598,8 +5623,8 @@ msgid "Error 404"
msgstr "Erreur 404"
#: templates/404.html:10
msgid "Oh no! This page does not exist..."
msgstr "Oh non ! Cette page n'existe pas..."
msgid "Oh no! This page does not exist"
msgstr "Oh non ! Cette page n'existe pas"
#: templates/404.html:12
msgid ""
......@@ -5736,6 +5761,10 @@ msgstr "Proxy IRC et interface distante"
msgid "Scripts manager"
msgstr "Gestionnaire de scripts"
#: templates/about/features.html:52
msgid "Alias, aspell, charset, logger, etc."
msgstr "Alias, aspell, charset, logger, etc."
#: templates/about/features.html:68
msgid "The future is now!"
msgstr "Le futur c'est maintenant !"
......@@ -6150,9 +6179,9 @@ msgid "send a mail to the list"
msgstr "envoyer un mail à la liste"
#: templates/about/support.html:101
msgid "<strong>weechat-support</strong> (installation, usage, bugs, ...):"
msgid "<strong>weechat-support</strong> (installation, usage, bugs, etc.):"
msgstr ""
"<strong>weechat-support</strong> (installation, utilisation, bugs, ...) :"
"<strong>weechat-support</strong> (installation, utilisation, bugs, etc.) :"
#: templates/about/support.html:108
msgid "<strong>weechat-dev</strong> (everything related to the development):"
......@@ -7273,9 +7302,9 @@ msgstr "Soumettre"
#: templates/scripts/add_error.html:12 templates/scripts/update_error.html:12
#: templates/themes/add_error.html:12 templates/themes/update_error.html:12
msgid "Oops... Something went wrong while processing the form :("
msgid "Oops Something went wrong while processing the form :("
msgstr ""
"Oops... Quelque chose de mauvais s'est produit pendant le traitement du "
"Oops Quelque chose de mauvais s'est produit pendant le traitement du "
"formulaire :("
#: templates/scripts/add_error.html:14 templates/scripts/update_error.html:14
......
......@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat.org\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-15 10:12+0100\n"
"POT-Creation-Date: 2018-12-26 17:58+0100\n"
"PO-Revision-Date: 2018-12-07 18:50+0100\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: Italian <marcopaolone@gmail.com>\n"
......@@ -192,12 +192,12 @@ msgstr ""
msgid "This field is required."
msgstr "Questo campo è obbligatorio."
#: dev/views.py:37
#: dev/views.py:38
#, fuzzy
msgid "Stable version."
msgstr "versione stabile"
#: dev/views.py:41
#: dev/views.py:42
#, fuzzy
#| msgid ""
#| "stable version, as number, like plugin API: info_get(\"version_number\")"
......@@ -206,37 +206,37 @@ msgid ""
msgstr ""
"versione stabile, come numero, come plugin API: info_get(\"version_number\")"
#: dev/views.py:46
#: dev/views.py:47
#, fuzzy
#| msgid "date of stable version"
msgid "Date of stable version (format: \"YYYY-MM-DD\")."
msgstr "data della versione stabile"
#: dev/views.py:50
#: dev/views.py:51
#, fuzzy
#| msgid "development version"
msgid "Development version."
msgstr "versione di sviluppo"
#: dev/views.py:54
#: dev/views.py:55
#, fuzzy
#| msgid "output of \"git rev-parse HEAD\" for sources repository"
msgid "Output of \"git rev-parse HEAD\" for sources repository."
msgstr "output di \"git rev-parse HEAD\" per il repository dei sorgenti"
#: dev/views.py:59
#: dev/views.py:60
#, fuzzy
#| msgid "output of \"git rev-parse HEAD\" for scripts repository"
msgid "Output of \"git rev-parse HEAD\" for scripts repository."
msgstr "output di \"git rev-parse HEAD\" per il repository degli script"
#: dev/views.py:64
#: dev/views.py:65
#, fuzzy
#| msgid "next stable version"
msgid "Next stable version."
msgstr "prossima versione stabile"
#: dev/views.py:68
#: dev/views.py:69
#, fuzzy
#| msgid ""
#| "next stable version, as number, like plugin API: info_get(\"version_number"
......@@ -248,18 +248,39 @@ msgstr ""
"prossima versioen stabile, come numero, come plugin API: "
"info_get(\"version_number\")"
#: dev/views.py:73
#: dev/views.py:74
#, fuzzy
#| msgid "approximate date of next stable version"
msgid "Approximate date of next stable version (format: \"YYYY-MM-DD\")."
msgstr "data approssimativa della prossima versione stabile"
#: dev/views.py:78
#: dev/views.py:79
msgid "Release signing key fingerprint (format: PGP fingerprint)."
msgstr ""
#: dev/views.py:84
msgid "Release signing key (format: PGP public key)."
msgstr ""
#: dev/views.py:88
msgid ""
"Debian/Ubuntu repository signing key fingerprint (format: PGP fingerprint)."
msgstr ""
#: dev/views.py:93
msgid "Debian/Ubuntu repository signing key (format: PGP public key)."
msgstr ""
#: dev/views.py:98
#, fuzzy
#| msgid "all infos (one info by line, format: \"info:value\")"
msgid "All infos (one info by line, format: \"info:value\")."
msgid "All non-binary infos (one info by line, format: \"info:value\")."
msgstr "tutte le info (una info per riga, formato \"info:valore\")"
#: dev/views.py:284
msgid "(binary data)"
msgstr ""
#: doc/_i18n_security.py:8
msgid "/set irc.network.colors_receive off"
msgstr ""
......@@ -4864,7 +4885,7 @@ msgstr "Licenza"
#: scripts/models.py:292
#, fuzzy
#| msgid "license (for example: GPL3, BSD, ...)"
msgid "The license (for example: GPL3, BSD, ...)."
msgid "The license (for example: GPL3, BSD, etc.)."
msgstr "licenza (per esempio: GPL3, BSD, ...)"
#: scripts/models.py:295 scripts/models.py:374
......@@ -4948,7 +4969,7 @@ msgid ""
msgstr "nome breve dello script (solo lettere minuscole, cifre o \"_\")"
#: scripts/models.py:351 themes/models.py:209
msgid "Choose..."
msgid "Choose"
msgstr ""
#: scripts/models.py:366 templates/scripts/source.html:14
......@@ -4986,7 +5007,9 @@ msgid "Error 403"
msgstr "Errore 403"
#: templates/403.html:10
msgid "Oh no! This page is forbidden..."
#, fuzzy
#| msgid "Oh no! This page is forbidden..."
msgid "Oh no! This page is forbidden…"
msgstr "Oh no! Questa pagina non è consentita..."
#: templates/403.html:12
......@@ -5003,7 +5026,9 @@ msgid "Error 404"
msgstr "Errore 404"
#: templates/404.html:10
msgid "Oh no! This page does not exist..."
#, fuzzy
#| msgid "Oh no! This page does not exist..."
msgid "Oh no! This page does not exist…"
msgstr "Oh no! Questa pagina non esiste..."
#: templates/404.html:12
......@@ -5145,6 +5170,10 @@ msgstr "interfaccia testuale"
msgid "Scripts manager"
msgstr "Gestore script."
#: templates/about/features.html:52
msgid "Alias, aspell, charset, logger, etc."
msgstr ""
#: templates/about/features.html:68
msgid "The future is now!"
msgstr ""
......@@ -5554,7 +5583,7 @@ msgid "send a mail to the list"
msgstr "Invia una mail a:"
#: templates/about/support.html:101
msgid "<strong>weechat-support</strong> (installation, usage, bugs, ...):"
msgid "<strong>weechat-support</strong> (installation, usage, bugs, etc.):"
msgstr ""
#: templates/about/support.html:108
......@@ -6702,7 +6731,7 @@ msgstr "Invia"
#: templates/scripts/add_error.html:12 templates/scripts/update_error.html:12
#: templates/themes/add_error.html:12 templates/themes/update_error.html:12
msgid "Oops... Something went wrong while processing the form :("
msgid "Oops Something went wrong while processing the form :("
msgstr ""
#: templates/scripts/add_error.html:14 templates/scripts/update_error.html:14
......
......@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat.org\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-15 10:12+0100\n"
"PO-Revision-Date: 2018-12-09 09:00+0900\n"
"POT-Creation-Date: 2018-12-26 17:58+0100\n"
"PO-Revision-Date: 2018-12-26 16:26+0100\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat.org/tree/master/"
"translation/ja_JP>\n"
......@@ -185,38 +185,38 @@ msgstr ""
msgid "This field is required."
msgstr "このフィールドは必須です。"
#: dev/views.py:37
#: dev/views.py:38
msgid "Stable version."
msgstr "安定版。"
#: dev/views.py:41
#: dev/views.py:42
msgid ""
"Stable version, as number, like plugin API: info_get(\"version_number\")."
msgstr ""
"安定版のバージョン番号 (数表記)、プラグイン API における "
"info_get(\"version_number\") と同様。"
#: dev/views.py:46
#: dev/views.py:47
msgid "Date of stable version (format: \"YYYY-MM-DD\")."
msgstr "安定版のリリース日 (書式: \"YYYY-MM-DD\")。"
#: dev/views.py:50
#: dev/views.py:51
msgid "Development version."
msgstr "開発版。"
#: dev/views.py:54
#: dev/views.py:55
msgid "Output of \"git rev-parse HEAD\" for sources repository."
msgstr "ソースリポジトリにおける \"git rev-parse HEAD\" の出力。"
#: dev/views.py:59
#: dev/views.py:60
msgid "Output of \"git rev-parse HEAD\" for scripts repository."
msgstr "スクリプトリポジトリにおける \"git rev-parse HEAD\" の出力。"
#: dev/views.py:64
#: dev/views.py:65
msgid "Next stable version."
msgstr "次期安定版のバージョン番号。"
#: dev/views.py:68
#: dev/views.py:69
msgid ""
"Next stable version, as number, like plugin API: info_get(\"version_number"
"\")."
......@@ -224,14 +224,37 @@ msgstr ""
"次期安定版のバージョン番号 (数表記)、プラグイン API における "
"info_get(\"version_number\") と同様。"
#: dev/views.py:73
#: dev/views.py:74
msgid "Approximate date of next stable version (format: \"YYYY-MM-DD\")."
msgstr "次期安定版のリリース予定日 (書式: \"YYYY-MM-DD\")。"
#: dev/views.py:78
msgid "All infos (one info by line, format: \"info:value\")."
#: dev/views.py:79
msgid "Release signing key fingerprint (format: PGP fingerprint)."
msgstr ""
#: dev/views.py:84
msgid "Release signing key (format: PGP public key)."
msgstr ""
#: dev/views.py:88
msgid ""
"Debian/Ubuntu repository signing key fingerprint (format: PGP fingerprint)."
msgstr ""
#: dev/views.py:93
msgid "Debian/Ubuntu repository signing key (format: PGP public key)."
msgstr ""
#: dev/views.py:98
#, fuzzy
#| msgid "All infos (one info by line, format: \"info:value\")."
msgid "All non-binary infos (one info by line, format: \"info:value\")."
msgstr "全ての情報 (1 行に 1 情報、書式: \"info:value\")。"
#: dev/views.py:284
msgid "(binary data)"
msgstr ""
#: doc/_i18n_security.py:8
msgid "/set irc.network.colors_receive off"
msgstr "/set irc.network.colors_receive off"
......@@ -5270,7 +5293,9 @@ msgid "License"
msgstr "ライセンス"
#: scripts/models.py:292
msgid "The license (for example: GPL3, BSD, ...)."
#, fuzzy
#| msgid "The license (for example: GPL3, BSD, ...)."
msgid "The license (for example: GPL3, BSD, etc.)."
msgstr "ライセンス (例: GPL3、BSD、...)。"
#: scripts/models.py:295 scripts/models.py:374
......@@ -5344,8 +5369,8 @@ msgstr ""
"可)。"
#: scripts/models.py:351 themes/models.py:209
msgid "Choose..."
msgstr "選択..."
msgid "Choose"
msgstr "選択"
#: scripts/models.py:366 templates/scripts/source.html:14
msgid "Script"
......@@ -5378,8 +5403,8 @@ msgid "Error 403"
msgstr "エラー 403"
#: templates/403.html:10
msgid "Oh no! This page is forbidden..."
msgstr "あっ! このページは観覧禁止です..."
msgid "Oh no! This page is forbidden"
msgstr "あっ! このページは観覧禁止です"
#: templates/403.html:12
msgid "You're looking where you shouldn't? ;)"
......@@ -5394,8 +5419,8 @@ msgid "Error 404"
msgstr "エラー 404"
#: templates/404.html:10
msgid "Oh no! This page does not exist..."
msgstr "あっ! このページは存在しません..."
msgid "Oh no! This page does not exist"
msgstr "あっ! このページは存在しません"
#: templates/404.html:12
msgid ""
......@@ -5529,6 +5554,10 @@ msgstr "IRC プロキシとリモートインターフェース"
msgid "Scripts manager"
msgstr "スクリプトマネージャ"
#: templates/about/features.html:52
msgid "Alias, aspell, charset, logger, etc."
msgstr ""
#: templates/about/features.html:68
msgid "The future is now!"
msgstr "未来はすぐそこ!"
......@@ -5942,7 +5971,9 @@ msgid "send a mail to the list"
msgstr "メーリングリストにメールを送信"
#: templates/about/support.html:101
msgid "<strong>weechat-support</strong> (installation, usage, bugs, ...):"
#, fuzzy
#| msgid "<strong>weechat-support</strong> (installation, usage, bugs, ...):"
msgid "<strong>weechat-support</strong> (installation, usage, bugs, etc.):"
msgstr "<strong>weechat-support</strong> (インストール、使い方、バグ、...):"
#: templates/about/support.html:108
......@@ -7048,8 +7079,8 @@ msgstr "投稿"
#: templates/scripts/add_error.html:12 templates/scripts/update_error.html:12
#: templates/themes/add_error.html:12 templates/themes/update_error.html:12
msgid "Oops... Something went wrong while processing the form :("
msgstr "おっと... フォームの処理中に何か問題が起きました :("
msgid "Oops Something went wrong while processing the form :("
msgstr "おっと フォームの処理中に何か問題が起きました :("
#: templates/scripts/add_error.html:14 templates/scripts/update_error.html:14
#: templates/themes/add_error.html:14 templates/themes/update_error.html:14
......
......@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat.org\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-15 10:12+0100\n"
"PO-Revision-Date: 2018-12-07 18:50+0100\n"
"POT-Creation-Date: 2018-12-26 17:58+0100\n"
"PO-Revision-Date: 2018-12-26 16:27+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
"Language-Team: Polish <>\n"
"Language: pl\n"
......@@ -179,38 +179,38 @@ msgstr ""
msgid "This field is required."
msgstr "To pole jest wymagane."
#: dev/views.py:37
#: dev/views.py:38
msgid "Stable version."
msgstr "Wersja stabilna."
#: dev/views.py:41
#: dev/views.py:42
msgid ""
"Stable version, as number, like plugin API: info_get(\"version_number\")."
msgstr ""
"Wersja stabilna, jako liczba, jak w API wtyczek: info_get(\"version_number"
"\")."
#: dev/views.py:46
#: dev/views.py:47
msgid "Date of stable version (format: \"YYYY-MM-DD\")."
msgstr "Data wydania stabilnej wersji (format: \"YYYY-MM-DD\")."
#: dev/views.py:50
#: dev/views.py:51
msgid "Development version."
msgstr "Wersja rozwojowa."
#: dev/views.py:54
#: dev/views.py:55
msgid "Output of \"git rev-parse HEAD\" for sources repository."
msgstr "Wynik \"git rev-parse HEAD\" dla repozytorium ze źródłami."
#: dev/views.py:59
#: dev/views.py:60
msgid "Output of \"git rev-parse HEAD\" for scripts repository."
msgstr "Wynik \"git rev-parse HEAD\" dla repozytorium ze źródłami."
#: dev/views.py:64
#: dev/views.py:65
msgid "Next stable version."
msgstr "Następna stabilna wersja."
#: dev/views.py:68
#: dev/views.py:69
msgid ""
"Next stable version, as number, like plugin API: info_get(\"version_number"
"\")."
......@@ -218,15 +218,38 @@ msgstr ""
"Następna stabilna wersja, jako numer, jak w API wtyczek: "
"info_get(\"version_number\")."
#: dev/views.py:73
#: dev/views.py:74
msgid "Approximate date of next stable version (format: \"YYYY-MM-DD\")."
msgstr ""
"Przybliżona data wydania kolejnej stabilnej wersji (format: \"YYYY-MM-DD\")."
#: dev/views.py:78
msgid "All infos (one info by line, format: \"info:value\")."
#: dev/views.py:79
msgid "Release signing key fingerprint (format: PGP fingerprint)."
msgstr ""
#: dev/views.py:84
msgid "Release signing key (format: PGP public key)."
msgstr ""
#: dev/views.py:88
msgid ""
"Debian/Ubuntu repository signing key fingerprint (format: PGP fingerprint)."
msgstr ""
#: dev/views.py:93
msgid "Debian/Ubuntu repository signing key (format: PGP public key)."
msgstr ""
#: dev/views.py:98
#, fuzzy
#| msgid "All infos (one info by line, format: \"info:value\")."
msgid "All non-binary infos (one info by line, format: \"info:value\")."
msgstr "Wszystkie informacje (jedna na linie, format \"info:wartość\")."
#: dev/views.py:284
msgid "(binary data)"
msgstr ""
#: doc/_i18n_security.py:8
msgid "/set irc.network.colors_receive off"
msgstr "/set irc.network.colors_receive off"
......@@ -5334,7 +5357,9 @@ msgid "License"
msgstr "Licencja"
#: scripts/models.py:292
msgid "The license (for example: GPL3, BSD, ...)."
#, fuzzy
#| msgid "The license (for example: GPL3, BSD, ...)."
msgid "The license (for example: GPL3, BSD, etc.)."
msgstr "Licencja (na przykład: GPL3, BSD, ...)."
#: scripts/models.py:295 scripts/models.py:374
......@@ -5408,8 +5433,8 @@ msgstr ""
"cyfry lub \"_\")."
#: scripts/models.py:351 themes/models.py:209
msgid "Choose..."
msgstr "Wybierz..."
msgid "Choose"
msgstr "Wybierz"
#: scripts/models.py:366 templates/scripts/source.html:14
msgid "Script"
......@@ -5442,8 +5467,8 @@ msgid "Error 403"
msgstr "Błąd 403"
#: templates/403.html:10
msgid "Oh no! This page is forbidden..."
msgstr "O nie! Ta strona jest zakazana..."
msgid "Oh no! This page is forbidden"
msgstr "O nie! Ta strona jest zakazana"
#: templates/403.html:12
msgid "You're looking where you shouldn't? ;)"
......@@ -5458,8 +5483,8 @@ msgid "Error 404"
msgstr "Błąd 404"
#: templates/404.html:10
msgid "Oh no! This page does not exist..."
msgstr "O nie! Ta strona nie istnieje..."
msgid "Oh no! This page does not exist"
msgstr "O nie! Ta strona nie istnieje"
#: templates/404.html:12
msgid ""
......@@ -5595,6 +5620,10 @@ msgstr "Pośrednik IRC i zdalne interfejsy"
msgid "Scripts manager"
msgstr "Menadżer skryptów"
#: templates/about/features.html:52
msgid "Alias, aspell, charset, logger, etc."
msgstr ""
#: templates/about/features.html:68
msgid "The future is now!"
msgstr "Przyszłość jest teraz!"
......@@ -6001,7 +6030,9 @@ msgid "send a mail to the list"
msgstr "wyślij wiadomości na listę"
#: templates/about/support.html:101
msgid "<strong>weechat-support</strong> (installation, usage, bugs, ...):"
#, fuzzy
#| msgid "<strong>weechat-support</strong> (installation, usage, bugs, ...):"
msgid "<strong>weechat-support</strong> (installation, usage, bugs, etc.):"
msgstr ""
"<strong>weechat-support</strong> (instalacja, użytkowanie, błędy, ...):"
......@@ -7118,7 +7149,9 @@ msgstr "Wyślij"
#: templates/scripts/add_error.html:12 templates/scripts/update_error.html:12
#: templates/themes/add_error.html:12 templates/themes/update_error.html:12
msgid "Oops... Something went wrong while processing the form :("
#, fuzzy
#| msgid "Oops... Something went wrong while processing the form :("
msgid "Oops… Something went wrong while processing the form :("
msgstr "Oops... Coś się nie udało podczas przetwarzania formularza :("
#: templates/scripts/add_error.html:14 templates/scripts/update_error.html:14
......
......@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat.org\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-15 10:12+0100\n"
"POT-Creation-Date: 2018-12-26 17:58+0100\n"
"PO-Revision-Date: 2018-12-07 18:50+0100\n"
"Last-Translator: Alexandre Bolelli <semeion7@gmail.com>\n"
"Language-Team: Portuguese <semeion7@gmail.com>\n"
......@@ -178,13 +178,13 @@ msgstr ""
msgid "This field is required."
msgstr "Este campo é obrigatório."
#: dev/views.py:37
#: dev/views.py:38
#, fuzzy
#| msgid "Stable version"
msgid "Stable version."
msgstr "Versão estável"
#: dev/views.py:41
#: dev/views.py:42
#, fuzzy
#| msgid ""
#| "stable version, as number, like plugin API: info_get(\"version_number\")"
......@@ -193,37 +193,37 @@ msgid ""
msgstr ""
"versão estável, como número, como plugin da API: info_get(\"version_number\")"
#: dev/views.py:46
#: dev/views.py:47
#, fuzzy
#| msgid "date of stable version"
msgid "Date of stable version (format: \"YYYY-MM-DD\")."
msgstr "data da versão estável"
#: dev/views.py:50
#: dev/views.py:51
#, fuzzy
#| msgid "development version"
msgid "Development version."
msgstr "versão de desenvolvimento"
#: dev/views.py:54
#: dev/views.py:55
#, fuzzy
#| msgid "output of \"git rev-parse HEAD\" for sources repository"
msgid "Output of \"git rev-parse HEAD\" for sources repository."
msgstr "saída de \"git rev-parse HEAD\" para o repositório de fontes"
#: dev/views.py:59
#: dev/views.py:60
#, fuzzy
#| msgid "output of \"git rev-parse HEAD\" for scripts repository"
msgid "Output of \"git rev-parse HEAD\" for scripts repository."
msgstr "saída de \"git rev-parse HEAD\" para o repositório scripts"
#: dev/views.py:64
#: dev/views.py:65
#, fuzzy
#| msgid "next stable version"
msgid "Next stable version."
msgstr "próxima versão estável"
#: dev/views.py:68
#: dev/views.py:69
#, fuzzy
#| msgid ""
#| "next stable version, as number, like plugin API: info_get(\"version_number"
......@@ -235,19 +235,40 @@ msgstr ""
"próxima versão estável, como número, como plugin da API: "
"info_get(\"version_number\")"
#: dev/views.py:73
#: dev/views.py:74
#, fuzzy
#| msgid "approximate date of next stable version"
msgid "Approximate date of next stable version (format: \"YYYY-MM-DD\")."
msgstr "data aproximada da próxima versão estável"
#: dev/views.py:78
#: dev/views.py:79
msgid "Release signing key fingerprint (format: PGP fingerprint)."
msgstr ""
#: dev/views.py:84
msgid "Release signing key (format: PGP public key)."
msgstr ""
#: dev/views.py:88
msgid ""
"Debian/Ubuntu repository signing key fingerprint (format: PGP fingerprint)."
msgstr ""
#: dev/views.py:93
msgid "Debian/Ubuntu repository signing key (format: PGP public key)."
msgstr ""
#: dev/views.py:98
#, fuzzy
#| msgid "all infos (one info by line, format: \"info:value\")"
msgid "All infos (one info by line, format: \"info:value\")."
msgid "All non-binary infos (one info by line, format: \"info:value\")."
msgstr ""
"todas as informações (uma informação por linha, formato: \"info:value\")"
#: dev/views.py:284
msgid "(binary data)"
msgstr ""
#: doc/_i18n_security.py:8
msgid "/set irc.network.colors_receive off"
msgstr "/set irc.network.colors_receive off"
......@@ -4971,7 +4992,7 @@ msgstr "Licença"
#: scripts/models.py:292
#, fuzzy
#| msgid "license (for example: GPL3, BSD, ...)"
msgid "The license (for example: GPL3, BSD, ...)."
msgid "The license (for example: GPL3, BSD, etc.)."
msgstr "licença (por exemplo: GPL3, BSD, ...)"
#: scripts/models.py:295 scripts/models.py:374
......@@ -5055,7 +5076,7 @@ msgid ""
msgstr "nome abreviado do script (somente letras minúsculas, numeros ou \"_\")"
#: scripts/models.py:351 themes/models.py:209
msgid "Choose..."
msgid "Choose"
msgstr ""
#: scripts/models.py:366 templates/scripts/source.html:14
......@@ -5093,7 +5114,9 @@ msgid "Error 403"
msgstr "Erro 403"
#: templates/403.html:10
msgid "Oh no! This page is forbidden..."
#, fuzzy
#| msgid "Oh no! This page is forbidden..."
msgid "Oh no! This page is forbidden…"
msgstr "Oh não! Esta página está proibida..."
#: templates/403.html:12
......@@ -5110,7 +5133,9 @@ msgid "Error 404"
msgstr "Erro 404"
#: templates/404.html:10
msgid "Oh no! This page does not exist..."
#, fuzzy
#| msgid "Oh no! This page does not exist..."
msgid "Oh no! This page does not exist…"
msgstr "Oh não! Esta página não existe..."
#: templates/404.html:12
......@@ -5258,6 +5283,10 @@ msgstr "Interface de proxy e retransmissor remotos"
msgid "Scripts manager"
msgstr "Gerenciador de scripts"
#: templates/about/features.html:52
msgid "Alias, aspell, charset, logger, etc."
msgstr ""
#: templates/about/features.html:68
msgid "The future is now!"
msgstr "O futuro é agora!"
......@@ -5677,7 +5706,7 @@ msgid "send a mail to the list"
msgstr "Enviar email para:"
#: templates/about/support.html:101
msgid "<strong>weechat-support</strong> (installation, usage, bugs, ...):"
msgid "<strong>weechat-support</strong> (installation, usage, bugs, etc.):"
msgstr ""
#: templates/about/support.html:108
......@@ -6906,7 +6935,9 @@ msgstr "Entregar"
#: templates/scripts/add_error.html:12 templates/scripts/update_error.html:12
#: templates/themes/add_error.html:12 templates/themes/update_error.html:12
msgid "Oops... Something went wrong while processing the form :("
#, fuzzy
#| msgid "Oops... Something went wrong while processing the form :("
msgid "Oops… Something went wrong while processing the form :("
msgstr "Ops... Alguma coisa saiu errada processando o formulário :("
#: templates/scripts/add_error.html:14 templates/scripts/update_error.html:14
......
......@@ -289,7 +289,7 @@ class ScriptFormAdd(Form):
license = CharField(
max_length=MAX_LENGTH_LICENSE,
label=ugettext_lazy('License'),
help_text=ugettext_lazy('The license (for example: GPL3, BSD, ...).'),
help_text=ugettext_lazy('The license (for example: GPL3, BSD, etc.).'),
)
file = FileField(
label=ugettext_lazy('File'),
......@@ -336,7 +336,7 @@ class ScriptFormAdd(Form):
super(ScriptFormAdd, self).__init__(*args, **kwargs)
self.label_suffix = ''
self.fields['min_max'].choices = get_min_max_choices()
self.fields['name'].help_text = ugettext_lazy(
self.fields['name'].help_text = ugettext(
'The short name of script (max {max_chars} chars, '
'only lower case letters, digits or "_").').format(
max_chars=MAX_LENGTH_NAME)
......@@ -348,7 +348,7 @@ def get_script_choices():
script_list = (Script.objects.exclude(max_weechat='0.2.6')
.filter(visible=1).order_by('name'))
script_choices = []
script_choices.append(('', ugettext_lazy('Choose...')))
script_choices.append(('', ugettext(u'Choose…')))
for script in script_list:
name = '%s - v%s (%s)' % (script.name_with_extension(),
script.version, script.version_weechat())
......@@ -422,7 +422,7 @@ def handler_script_changed(sender, **kwargs):
value = ''
else:
if key == 'url':
# FIXME: use the "Host" from request, but...
# FIXME: use the "Host" from request, but
# request is not available in this handler!
value = ('https://weechat.org/%s' %
script.build_url()[1:])
......
......@@ -7,7 +7,7 @@
{% block error_message %}
{% trans "Oh no! This page is forbidden..." %}
{% trans "Oh no! This page is forbidden" %}
<br><br>
{% trans "You're looking where you shouldn't? ;)" %}
......
......@@ -7,7 +7,7 @@
{% block error_message %}
{% trans "Oh no! This page does not exist..." %}
{% trans "Oh no! This page does not exist" %}
<br><br>
{% trans "You can go back to WeeChat home with link below,<br>or report broken link to" %}
<a href="mailto:{% txt2html "webmaster@weechat.org" %}?subject=Broken link on weechat site: {{ request.build_absolute_uri|urlencode }}">{% txt2html "webmaster@weechat.org" %}</a>
......
......@@ -11,7 +11,7 @@
<body>
<h1>Error 500</h1>
<h2>Oh no! This is a server error...</h2>
<h2>Oh no! This is a server error</h2>
This error should be fixed soon, sorry for inconvenience.
<br><br>
<a href="/">Back to home</a>
......
......@@ -49,7 +49,7 @@
<li>{% trans "API for script languages" %} (Python, Perl, Ruby, Lua, Tcl, Scheme, Javascript, PHP)</li>
<li>{% trans "IRC proxy and remote interface" %} (relay)</li>
<li>{% trans "Scripts manager" %}</li>
<li>Alias, aspell, charset, logger, ...</li>
<li>{% trans "Alias, aspell, charset, logger, etc." %}</li>
</ul>
</p>
</div>
......
......@@ -98,7 +98,7 @@
</ul>
</li>
<li>
{% trans "<strong>weechat-support</strong> (installation, usage, bugs, ...):" %}
{% trans "<strong>weechat-support</strong> (installation, usage, bugs, etc.):" %}
<ul>
<li><a href="https://lists.nongnu.org/mailman/listinfo/weechat-support" target="_blank" rel="noopener">{% trans "subscribe" %} <img src="{{ MEDIA_URL }}images/link.png" width="16" height="16" alt="&gt;&gt;"></a></li>
<li><a href="mailto:{% txt2html "weechat-support@nongnu.org" %}">{% trans "send a mail to the list" %}</a></li>
......
......@@ -8,7 +8,7 @@
{% block extrahead %}
<script>
var deb_apt_cmds = [
"...<br>...",
"…<br>…",
{% for repo in repositories %}
{% if repo.visible %}
"$ echo \"{{ repo.apt_url }}\" | sudo tee /etc/apt/sources.list.d/weechat.list" +
......@@ -79,7 +79,7 @@ var deb_apt_cmds = [
{% endfor %}
</select>
</form>
<pre class="mt-1"><code id="deb_apt_cmd">...<br>...</code></pre>
<pre class="mt-1"><code id="deb_apt_cmd"><br></code></pre>
{% trans "Note: the second command line is optional, it is used to download source packages." %}
</p>
<p>
......
......@@ -41,7 +41,7 @@
<li class="page-item"><a class="page-link" href="?pagesize={{ pagesize }}&page=1">1</a></li>
{% endif %}
{% if smart_page_range.0 > 2 %}
<li class="page-item disabled"><span class="page-link">...</span></li>
<li class="page-item disabled"><span class="page-link"></span></li>
{% endif %}
{% for page in smart_page_range %}
......@@ -53,7 +53,7 @@
{% endfor %}
{% if smart_page_range|last < infos.paginator.num_pages|add:"-1" %}
<li class="page-item disabled"><span class="page-link">...</span></li>
<li class="page-item disabled"><span class="page-link"></span></li>
{% endif %}
{% if smart_page_range|last < infos.paginator.num_pages %}
<li class="page-item"><a class="page-link" href="?pagesize={{ pagesize }}&page={{ infos.paginator.num_pages }}">{{ infos.paginator.num_pages }}</a></li>
......
......@@ -9,7 +9,7 @@
{{ block.super }}
<div class="errorbox">
{% trans "Oops... Something went wrong while processing the form :(" %}
{% trans "Oops Something went wrong while processing the form :(" %}
<br><br>
{% trans "You can try again or report problem to webmaster if the problem persists." %}
</div>
......
......@@ -9,7 +9,7 @@
{{ block.super }}
<div class="errorbox">
{% trans "Oops... Something went wrong while processing the form :(" %}
{% trans "Oops Something went wrong while processing the form :(" %}
<br><br>
{% trans "You can try again or report problem to webmaster if the problem persists." %}
</div>
......
......@@ -9,7 +9,7 @@
{{ block.super }}
<div class="errorbox">
{% trans "Oops... Something went wrong while processing the form :(" %}
{% trans "Oops Something went wrong while processing the form :(" %}
<br><br>
{% trans "You can try again or report problem to webmaster if the problem persists." %}
</div>
......
......@@ -9,7 +9,7 @@
{{ block.super }}
<div class="errorbox">
{% trans "Oops... Something went wrong while processing the form :(" %}
{% trans "Oops Something went wrong while processing the form :(" %}
<br><br>
{% trans "You can try again or report problem to webmaster if the problem persists." %}
</div>
......
......@@ -206,7 +206,7 @@ def get_theme_choices():
try:
theme_list = Theme.objects.filter(visible=1).order_by('name')
theme_choices = []
theme_choices.append(('', ugettext_lazy('Choose...')))
theme_choices.append(('', ugettext(u'Choose…')))
for theme in theme_list:
theme_choices.append((theme.id, '%s (%s)' % (theme.name,
theme.version)))
......@@ -327,7 +327,7 @@ def handler_theme_changed(sender, **kwargs):
strvalue = '%s' % value
xml += getxmlline(key, strvalue)
json += getjsonline(key, strvalue)
# FIXME: use the "Host" from request, but...
# FIXME: use the "Host" from request, but
# request is not available in this handler!
strvalue = 'https://weechat.org/%s' % theme.build_url()[1:]
xml += ' %s\n' % xml_value('url', strvalue)
......