1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
|
From 1cc28c1f9b58456de13765edfde0bb92e9a8cd1d Mon Sep 17 00:00:00 2001
From: Neil <Neil Muller drnlmuller+debian@gmail.com>
Date: Tue, 14 Jun 2016 14:38:32 +0200
Subject: Fix a collection of errors from msgfmt.
Origin: upstream, https://github.com/formencode/formencode/commit/1fdeaabe07167b657db455b3053d7d09d6784f60
and https://github.com/formencode/formencode/commit/88c4e8cae3975565e65e7f5e751e16c09a5ae982
Fix a number of minor issues that msgfmt marks as errors. This includes
missing format specifiers, invalid format strings due to translating the
substiution name and typos in the translated format string.
---
formencode/i18n/it/LC_MESSAGES/FormEncode.po | 2 +-
formencode/i18n/ja/LC_MESSAGES/FormEncode.po | 2 +-
formencode/i18n/ko/LC_MESSAGES/FormEncode.po | 2 +-
formencode/i18n/nl/LC_MESSAGES/FormEncode.po | 8 +++++---
formencode/i18n/sl/LC_MESSAGES/FormEncode.po | 2 --
formencode/i18n/sr/LC_MESSAGES/FormEncode.po | 4 ++--
formencode/i18n/sv/LC_MESSAGES/FormEncode.po | 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/formencode/i18n/it/LC_MESSAGES/FormEncode.po b/formencode/i18n/it/LC_MESSAGES/FormEncode.po
index f9a2304..5290851 100644
--- a/formencode/i18n/it/LC_MESSAGES/FormEncode.po
+++ b/formencode/i18n/it/LC_MESSAGES/FormEncode.po
@@ -440,7 +440,7 @@ msgstr "Inserire i minuti ( dopo i : )"
#: formencode/validators.py:2075
#, python-format
msgid "The %(part)s value you gave is not a number: %(number)r"
-msgstr "%(part), non e' un numero: %(number)r"
+msgstr "%(part)s, non e' un numero: %(number)r"
#: formencode/validators.py:2076
#, python-format
diff --git a/formencode/i18n/ja/LC_MESSAGES/FormEncode.po b/formencode/i18n/ja/LC_MESSAGES/FormEncode.po
index e611686..3d1bdc8 100644
--- a/formencode/i18n/ja/LC_MESSAGES/FormEncode.po
+++ b/formencode/i18n/ja/LC_MESSAGES/FormEncode.po
@@ -494,7 +494,7 @@ msgstr ""
#: formencode/validators.py:2586
#, python-format
msgid "You must give a value for %s"
-msgstr "% の値を入力してください"
+msgstr "%s の値を入力してください"
#: formencode/validators.py:2619
#, python-format
diff --git a/formencode/i18n/ko/LC_MESSAGES/FormEncode.po b/formencode/i18n/ko/LC_MESSAGES/FormEncode.po
index def4968..e249992 100644
--- a/formencode/i18n/ko/LC_MESSAGES/FormEncode.po
+++ b/formencode/i18n/ko/LC_MESSAGES/FormEncode.po
@@ -327,7 +327,7 @@ msgstr "올바른 URL이 아닙니다"
#: formencode/validators.py:1455
#, python-format
msgid "An error occurred when trying to access the URL: %(error)s"
-msgstr "URL에 접속 시도중 오류가 발생했습니다: $(error)s"
+msgstr "URL에 접속 시도중 오류가 발생했습니다: %(error)s"
#: formencode/validators.py:1459
msgid "The server responded that the page could not be found"
diff --git a/formencode/i18n/nl/LC_MESSAGES/FormEncode.po b/formencode/i18n/nl/LC_MESSAGES/FormEncode.po
index aa904af..1fd58f2 100644
--- a/formencode/i18n/nl/LC_MESSAGES/FormEncode.po
+++ b/formencode/i18n/nl/LC_MESSAGES/FormEncode.po
@@ -292,7 +292,7 @@ msgstr ""
msgid ""
"The username portion of the email address is invalid (the portion before the "
"@: %(username)s)"
-msgstr "Ongeldig emailadres: het deel vóór de \"@\" is incorrect"
+msgstr "Ongeldig emailadres: het deel vóór de \"@: %(username)s\" is incorrect"
#: formencode/validators.py:1271 formencode/validators.py:1413
#, python-format
@@ -305,7 +305,8 @@ msgid ""
"The domain portion of the email address is invalid (the portion after the @: "
"%(domain)s)"
msgstr ""
-"Ongeldig emailadres: het \"domain\" (het deel achter de \"@\") is incorrect"
+"Ongeldig emailadres: het \"domain\" (het deel achter de \"@: %(domain)s\") "
+"is incorrect"
#: formencode/validators.py:1275
#, python-format
@@ -313,7 +314,8 @@ msgid ""
"The domain of the email address does not exist (the portion after the @: "
"%(domain)s)"
msgstr ""
-"Ongeldig emailadres: het \"domain\" (het deel achter de \"@\") bestaat niet"
+"Ongeldig emailadres: het \"domain\" (het deel achter de \"@: %(domain)s\") "
+"bestaat niet"
#: formencode/validators.py:1409
msgid "You must start your URL with http://, https://, etc"
diff --git a/formencode/i18n/sl/LC_MESSAGES/FormEncode.po b/formencode/i18n/sl/LC_MESSAGES/FormEncode.po
index 2eb35ee..56702f5 100644
--- a/formencode/i18n/sl/LC_MESSAGES/FormEncode.po
+++ b/formencode/i18n/sl/LC_MESSAGES/FormEncode.po
@@ -302,8 +302,6 @@ msgstr "Domenski del e-poštnega naslova je neveljaven: %(domain)s"
#: formencode/validators.py:1275
#, fuzzy, python-format
-#| msgid "" "The domain portion of the email address is invalid (the portion
-#| after the" " @: %(domain)s)"
msgid ""
"The domain of the email address does not exist (the portion after the @: "
"%(domain)s)"
diff --git a/formencode/i18n/sr/LC_MESSAGES/FormEncode.po b/formencode/i18n/sr/LC_MESSAGES/FormEncode.po
index 5caa58a..ff8c168 100644
--- a/formencode/i18n/sr/LC_MESSAGES/FormEncode.po
+++ b/formencode/i18n/sr/LC_MESSAGES/FormEncode.po
@@ -2,7 +2,7 @@
# Copyright (C) 2013 Laboratorijski informacioni sistemi
# This file is distributed under the same license as the FormEncode project.
# Andrija Zaric <andrija@lis.rs>, 2012.
-# Updated by Nina Plakalovic <nina@lis.rs>, 2013
+# Updated by Nina Plakalovic <nina@lis.rs>, 2013, Miloš Gavrilov, 2016.
#
msgid ""
msgstr ""
@@ -373,7 +373,7 @@ msgstr "Молим, унесите датум у облику %(format)s"
#: formencode/validators.py:1942
msgid "Please enter a month from 1 to 12"
-msgstr "Молим, унесите даутм у облику %(format)s"
+msgstr "Молим, унесите месец између 1 и 12"
#: formencode/validators.py:1943
msgid "Please enter a valid day"
diff --git a/formencode/i18n/sv/LC_MESSAGES/FormEncode.po b/formencode/i18n/sv/LC_MESSAGES/FormEncode.po
index fcb3cf2..aa71a92 100644
--- a/formencode/i18n/sv/LC_MESSAGES/FormEncode.po
+++ b/formencode/i18n/sv/LC_MESSAGES/FormEncode.po
@@ -118,7 +118,7 @@ msgstr "Det språket inte är upptaget i ISO 639"
#: formencode/schema.py:68
#, python-format
msgid "The input field %(name)s was not expected."
-msgstr "Inmatningsfältet %(namn) var inte förväntat."
+msgstr "Inmatningsfältet %(name)s var inte förväntat."
#: formencode/schema.py:69
msgid "Missing value"
@@ -331,7 +331,7 @@ msgstr ""
#: formencode/validators.py:1461
#, python-format
msgid "You must provide a full domain name (like %(domain)s.com)"
-msgstr "Du måste ange ett komplett domännamn (som %(domän)er.com"
+msgstr "Du måste ange ett komplett domännamn (som %(domain)s.com"
#: formencode/validators.py:1602
msgid ""
|
