Skip to content

Commit b844cc4

Browse files
jpadillajpadilla
committed
Merge remote-tracking branch 'upstream/version-3.1' into version-3.1
Conflicts: rest_framework/serializers.py
2 parents 37dce89 + e63f49b commit b844cc4

File tree

49 files changed

+7241
-64
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+7241
-64
lines changed

‎docs/topics/3.1-announcement.md

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
1-
# Versioning
1+
# Django REST framework 3.1
22

3-
# Pagination
3+
## Pagination
44

5-
# Internationalization
5+
#### Pagination controls in the browsable API.
66

7-
# ModelSerializer API
7+
#### New schemes, including cursor pagination.
8+
9+
#### Support for header-based pagination.
10+
11+
## Versioning
12+
13+
## Internationalization
14+
15+
## New fields
16+
17+
## ModelSerializer API

‎rest_framework/locale/ar/LC_MESSAGES/django.mo

4.76 KB
Binary file not shown.

‎rest_framework/locale/ar/LC_MESSAGES/django.po

Lines changed: 325 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,325 @@
1+
# SOME DESCRIPTIVE TITLE.
2+
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3+
# This file is distributed under the same license as the PACKAGE package.
4+
#
5+
# Translators:
6+
# Eyad Toma <d.eyad.t@gmail.com>, 2015
7+
msgid ""
8+
msgstr ""
9+
"Project-Id-Version: Django REST framework\n"
10+
"Report-Msgid-Bugs-To: \n"
11+
"POT-Creation-Date: 2015-01-30 16:23+0000\n"
12+
"PO-Revision-Date: 2015-01-30 16:27+0000\n"
13+
"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
14+
"Language-Team: Arabic (http://www.transifex.com/projects/p/django-rest-framework/language/ar/)\n"
15+
"MIME-Version: 1.0\n"
16+
"Content-Type: text/plain; charset=UTF-8\n"
17+
"Content-Transfer-Encoding: 8bit\n"
18+
"Language: ar\n"
19+
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
20+
21+
#: authentication.py:69
22+
msgid "Invalid basic header. No credentials provided."
23+
msgstr ""
24+
25+
#: authentication.py:72
26+
msgid "Invalid basic header. Credentials string should not contain spaces."
27+
msgstr ""
28+
29+
#: authentication.py:78
30+
msgid "Invalid basic header. Credentials not correctly base64 encoded."
31+
msgstr ""
32+
33+
#: authentication.py:90
34+
msgid "Invalid username/password."
35+
msgstr "اسم المستخدم/كلمة السر غير صحيحين."
36+
37+
#: authentication.py:156
38+
msgid "Invalid token header. No credentials provided."
39+
msgstr ""
40+
41+
#: authentication.py:159
42+
msgid "Invalid token header. Token string should not contain spaces."
43+
msgstr ""
44+
45+
#: authentication.py:168
46+
msgid "Invalid token."
47+
msgstr ""
48+
49+
#: authentication.py:171
50+
msgid "User inactive or deleted."
51+
msgstr "المستخدم غير مفعل او تم حذفه."
52+
53+
#: exceptions.py:38
54+
msgid "A server error occurred."
55+
msgstr "حدث خطأ في المخدم."
56+
57+
#: exceptions.py:73
58+
msgid "Malformed request."
59+
msgstr ""
60+
61+
#: exceptions.py:78
62+
msgid "Incorrect authentication credentials."
63+
msgstr "بيانات الدخول غير صحيحة."
64+
65+
#: exceptions.py:83
66+
msgid "Authentication credentials were not provided."
67+
msgstr "لم يتم تزويد بيانات الدخول."
68+
69+
#: exceptions.py:88
70+
msgid "You do not have permission to perform this action."
71+
msgstr "ليس لديك صلاحية للقيام بهذا الإجراء."
72+
73+
#: exceptions.py:93
74+
msgid "Not found."
75+
msgstr "غير موجود."
76+
77+
#: exceptions.py:98
78+
msgid "Method \"{method}\" not allowed."
79+
msgstr ""
80+
81+
#: exceptions.py:109
82+
msgid "Could not satisfy the request Accept header."
83+
msgstr ""
84+
85+
#: exceptions.py:121
86+
msgid "Unsupported media type \"{media_type}\" in request."
87+
msgstr ""
88+
89+
#: exceptions.py:134
90+
msgid "Request was throttled."
91+
msgstr ""
92+
93+
#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
94+
#: validators.py:155
95+
msgid "This field is required."
96+
msgstr "هذا الحقل مطلوب."
97+
98+
#: fields.py:154
99+
msgid "This field may not be null."
100+
msgstr "لا يمكن لهذا الحقل ان يكون فارغاً null."
101+
102+
#: fields.py:487 fields.py:515
103+
msgid "\"{input}\" is not a valid boolean."
104+
msgstr "\"{input}\" ليس قيمة منطقية."
105+
106+
#: fields.py:550
107+
msgid "This field may not be blank."
108+
msgstr "لا يمكن لهذا الحقل ان يكون فارغاً."
109+
110+
#: fields.py:551 fields.py:1324
111+
msgid "Ensure this field has no more than {max_length} characters."
112+
msgstr "تأكد ان الحقل لا يزيد عن {max_length} محرف."
113+
114+
#: fields.py:552
115+
msgid "Ensure this field has at least {min_length} characters."
116+
msgstr "تأكد ان الحقل {min_length} محرف على الاقل."
117+
118+
#: fields.py:587
119+
msgid "Enter a valid email address."
120+
msgstr "عليك ان تدخل بريد إلكتروني صالح."
121+
122+
#: fields.py:604
123+
msgid "This value does not match the required pattern."
124+
msgstr "هذه القيمة لا تطابق النمط المطلوب."
125+
126+
#: fields.py:615
127+
msgid ""
128+
"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
129+
"hyphens."
130+
msgstr ""
131+
132+
#: fields.py:627
133+
msgid "Enter a valid URL."
134+
msgstr "الرجاء إدخال رابط إلكتروني صالح."
135+
136+
#: fields.py:638
137+
msgid "\"{value}\" is not a valid UUID."
138+
msgstr ""
139+
140+
#: fields.py:657
141+
msgid "A valid integer is required."
142+
msgstr "الرجاء إدخال رقم صحيح صالح."
143+
144+
#: fields.py:658 fields.py:692 fields.py:725
145+
msgid "Ensure this value is less than or equal to {max_value}."
146+
msgstr "تأكد ان القيمة أقل أو تساوي {max_value}."
147+
148+
#: fields.py:659 fields.py:693 fields.py:726
149+
msgid "Ensure this value is greater than or equal to {min_value}."
150+
msgstr "تأكد ان القيمة أكبر أو تساوي {min_value}."
151+
152+
#: fields.py:660 fields.py:694 fields.py:730
153+
msgid "String value too large."
154+
msgstr ""
155+
156+
#: fields.py:691 fields.py:724
157+
msgid "A valid number is required."
158+
msgstr "الرجاء إدخال رقم صالح."
159+
160+
#: fields.py:727
161+
msgid "Ensure that there are no more than {max_digits} digits in total."
162+
msgstr "تأكد ان القيمة لا تحوي أكثر من {max_digits} رقم."
163+
164+
#: fields.py:728
165+
msgid ""
166+
"Ensure that there are no more than {max_decimal_places} decimal places."
167+
msgstr ""
168+
169+
#: fields.py:729
170+
msgid ""
171+
"Ensure that there are no more than {max_whole_digits} digits before the "
172+
"decimal point."
173+
msgstr ""
174+
175+
#: fields.py:813
176+
msgid "Datetime has wrong format. Use one of these formats instead: {format}."
177+
msgstr "صيغة التاريخ و الوقت غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}."
178+
179+
#: fields.py:814
180+
msgid "Expected a datetime but got a date."
181+
msgstr ""
182+
183+
#: fields.py:878
184+
msgid "Date has wrong format. Use one of these formats instead: {format}."
185+
msgstr "صيغة التاريخ غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}."
186+
187+
#: fields.py:879
188+
msgid "Expected a date but got a datetime."
189+
msgstr ""
190+
191+
#: fields.py:936
192+
msgid "Time has wrong format. Use one of these formats instead: {format}."
193+
msgstr "صيغة الوقت غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}."
194+
195+
#: fields.py:992 fields.py:1036
196+
msgid "\"{input}\" is not a valid choice."
197+
msgstr "\"{input}\" ليست واحدة من الخيارات الصالحة."
198+
199+
#: fields.py:1037 fields.py:1151 serializers.py:482
200+
msgid "Expected a list of items but got type \"{input_type}\"."
201+
msgstr ""
202+
203+
#: fields.py:1067
204+
msgid "No file was submitted."
205+
msgstr "لم يتم إرسال أي ملف."
206+
207+
#: fields.py:1068
208+
msgid ""
209+
"The submitted data was not a file. Check the encoding type on the form."
210+
msgstr ""
211+
212+
#: fields.py:1069
213+
msgid "No filename could be determined."
214+
msgstr ""
215+
216+
#: fields.py:1070
217+
msgid "The submitted file is empty."
218+
msgstr "الملف الذي تم إرساله فارغ."
219+
220+
#: fields.py:1071
221+
msgid ""
222+
"Ensure this filename has at most {max_length} characters (it has {length})."
223+
msgstr "تأكد ان اسم الملف لا يحوي أكثر من {max_length} محرف (الإسم المرسل يحوي {length} محرف)."
224+
225+
#: fields.py:1113
226+
msgid ""
227+
"Upload a valid image. The file you uploaded was either not an image or a "
228+
"corrupted image."
229+
msgstr ""
230+
231+
#: fields.py:1188
232+
msgid "Expected a dictionary of items but got type \"{input_type}\"."
233+
msgstr ""
234+
235+
#: pagination.py:221
236+
msgid "Invalid page \"{page_number}\": {message}."
237+
msgstr "رقم الصفحة \"{page_number}\" غير صالح : {message}."
238+
239+
#: pagination.py:442
240+
msgid "Invalid cursor"
241+
msgstr ""
242+
243+
#: relations.py:133
244+
msgid "Invalid pk \"{pk_value}\" - object does not exist."
245+
msgstr "معرف العنصر \"{pk_value}\" غير صالح - العنصر غير موجود."
246+
247+
#: relations.py:134
248+
msgid "Incorrect type. Expected pk value, received {data_type}."
249+
msgstr ""
250+
251+
#: relations.py:157
252+
msgid "Invalid hyperlink - No URL match."
253+
msgstr ""
254+
255+
#: relations.py:158
256+
msgid "Invalid hyperlink - Incorrect URL match."
257+
msgstr ""
258+
259+
#: relations.py:159
260+
msgid "Invalid hyperlink - Object does not exist."
261+
msgstr ""
262+
263+
#: relations.py:160
264+
msgid "Incorrect type. Expected URL string, received {data_type}."
265+
msgstr ""
266+
267+
#: relations.py:295
268+
msgid "Object with {slug_name}={value} does not exist."
269+
msgstr ""
270+
271+
#: relations.py:296
272+
msgid "Invalid value."
273+
msgstr "قيمة غير صالحة."
274+
275+
#: serializers.py:299
276+
msgid "Invalid data. Expected a dictionary, but got {datatype}."
277+
msgstr ""
278+
279+
#: validators.py:22
280+
msgid "This field must be unique."
281+
msgstr ""
282+
283+
#: validators.py:76
284+
msgid "The fields {field_names} must make a unique set."
285+
msgstr ""
286+
287+
#: validators.py:219
288+
msgid "This field must be unique for the \"{date_field}\" date."
289+
msgstr ""
290+
291+
#: validators.py:234
292+
msgid "This field must be unique for the \"{date_field}\" month."
293+
msgstr ""
294+
295+
#: validators.py:247
296+
msgid "This field must be unique for the \"{date_field}\" year."
297+
msgstr ""
298+
299+
#: versioning.py:39
300+
msgid "Invalid version in \"Accept\" header."
301+
msgstr ""
302+
303+
#: versioning.py:70 versioning.py:112
304+
msgid "Invalid version in URL path."
305+
msgstr ""
306+
307+
#: versioning.py:138
308+
msgid "Invalid version in hostname."
309+
msgstr ""
310+
311+
#: versioning.py:160
312+
msgid "Invalid version in query parameter."
313+
msgstr ""
314+
315+
#: authtoken/serializers.py:20
316+
msgid "User account is disabled."
317+
msgstr "حساب المستخدم غير مفعل."
318+
319+
#: authtoken/serializers.py:23
320+
msgid "Unable to log in with provided credentials."
321+
msgstr "تعذر تسجيل الدخول بالبيانات التي ادخلتها."
322+
323+
#: authtoken/serializers.py:26
324+
msgid "Must include \"username\" and \"password\"."
325+
msgstr "يجب أن تتضمن \"اسم المستخدم\" و \"كلمة المرور\"."

‎rest_framework/locale/cs/LC_MESSAGES/django.mo

8.64 KB
Binary file not shown.

0 commit comments

Comments
 (0)