Skip to content

Commit dacb5fd

Browse files
committed
Fixed changes file comments, merged with upstream.
2 parents e5454c3 + 3dc2f90 commit dacb5fd

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

CHANGES.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ required to run those releases of Roundup.
1717
Features:
1818

1919
- issue2550894: migrate test suite and run_test.py to py.test (John Kristensen)
20-
- issue 2550880: Ability to choose password store scheme and SSHA
20+
- issue2550880: Ability to choose password store scheme and SSHA
2121
support. Discussion on devel list is tending in favor of this patch.
2222
Embedded test works, my manual test with a SSHA password
2323
assigned to a user allowed the user to log in. Ran the test suite
@@ -30,15 +30,15 @@ Fixed:
3030
From-header instead: new configuration option EMAIL_KEEP_REAL_FROM
3131
(Peter Funk aka Pefu).
3232
- issue2550717: Changed a couple of residual email references into
33-
e-mail in German translation (John Rouillard)
33+
E-Mail in German translation (John Rouillard)
3434
- issue2550669: Adding documentation for csv_field_size to the
3535
customizing tracker section of doc/customizing.txt (John Rouillard)
3636
- issue2550601: gsoc-2009 "bug" class doesn't have "patches" property
3737
Added multilink to patches to the bug schema in the devel template.
3838
(applied by John Rouillard)
3939
- issue2550748: Crash when creating new issues with non-existing
4040
multilink values (in classic template). Applied patch so it
41-
now errors the same way as an update does. (applied by John Rouillard)
41+
now errors the same way as an update does. (applied by John Rouillard)
4242

4343
2016-01-11: 1.5.1
4444

locale/de.po

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: Roundup 1.5.0\n"
99
"Report-Msgid-Bugs-To: [email protected]\n"
1010
"POT-Creation-Date: 2009-03-12 11:58+0200\n"
11-
"PO-Revision-Date: 2014-03-31 18:42+0200\n"
11+
"PO-Revision-Date: 2016-04-11 09:13+0200\n"
1212
"Last-Translator: Tobias Herp <[email protected]>\n"
1313
"Language-Team: German Translators <[email protected]>\n"
1414
"MIME-Version: 1.0\n"
@@ -2124,7 +2124,7 @@ msgid ""
21242124
"encrypted."
21252125
msgstr ""
21262126
"\n"
2127-
"Dieser Tracker wurde konfiguriert, E-mail-Nachrichten nur PGP-signiert oder\n"
2127+
"Dieser Tracker wurde konfiguriert, E-Mail-Nachrichten nur PGP-signiert oder\n"
21282128
"verschlüsselt entgegenzunehmen."
21292129

21302130
#: ../roundup/mailgw.py:1273
@@ -3580,7 +3580,7 @@ msgstr "(Voreinstellung: ${zone})"
35803580
#: ../share/roundup/templates/classic/html/user.register.html:53
35813581
#: ../share/roundup/templates/minimal/html/user.item.html:130
35823582
#: ../share/roundup/templates/minimal/html/user.register.html:53
3583-
msgid "Alternate E-mail addresses<br>One address per line"
3583+
msgid "Alternate E-Mail addresses<br>One address per line"
35843584
msgstr "<div title=\"alle, von denen E-Mails an den Bugtracker geschickt werden sollen\">Alternative E-Mail-Adressen</div><i>(eine pro Zeile)</i>"
35853585

35863586
#: ../share/roundup/templates/classic/html/user.register.html:4
@@ -3612,7 +3612,7 @@ msgstr "Telefon"
36123612
#: ../share/roundup/templates/classic/html/user.register.html:49
36133613
#: ../share/roundup/templates/minimal/html/user.register.html:49
36143614
msgid "E-mail address"
3615-
msgstr "E-mail-Adresse"
3615+
msgstr "E-Mail-Adresse"
36163616

36173617
#: ../share/roundup/templates/classic/html/user.rego_progress.html:4
36183618
#: ../share/roundup/templates/minimal/html/user.rego_progress.html:4

0 commit comments

Comments
 (0)