Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[soc2009/model-validation] Fixed some merge issues from [12014].

  • Loading branch information...
commit 8c62b72c060128c66726f211e2d40434a7d6f8bf 1 parent 5559eb5
Joseph Kocherhans authored December 29, 2009
364  django/conf/locale/pl/LC_MESSAGES/django.po
@@ -5,11 +5,7 @@ msgid ""
5 5
 msgstr ""
6 6
 "Project-Id-Version: Django\n"
7 7
 "Report-Msgid-Bugs-To: \n"
8  
-<<<<<<< HEAD
9  
-"POT-Creation-Date: 2009-10-25 20:56+0100\n"
10  
-=======
11 8
 "POT-Creation-Date: 2009-12-23 12:55+0100\n"
12  
->>>>>>> master
13 9
 "PO-Revision-Date: 2008-02-25 15:53+0100\n"
14 10
 "Last-Translator: Jarek Zgoda <jarek.zgoda@gmail.com>\n"
15 11
 "MIME-Version: 1.0\n"
@@ -227,11 +223,7 @@ msgstr "chiński tradycyjny"
227 223
 msgid "Successfully deleted %(count)d %(items)s."
228 224
 msgstr "Usunięto %(count)d %(items)s."
229 225
 
230  
-<<<<<<< HEAD
231  
-#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
232  
-=======
233 226
 #: contrib/admin/actions.py:67 contrib/admin/options.py:1073
234  
->>>>>>> master
235 227
 msgid "Are you sure?"
236 228
 msgstr "Jesteś pewien?"
237 229
 
@@ -274,17 +266,6 @@ msgstr "Ten miesiąc"
274 266
 msgid "This year"
275 267
 msgstr "Ten rok"
276 268
 
277  
-<<<<<<< HEAD
278  
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:435
279  
-msgid "Yes"
280  
-msgstr "Tak"
281  
-
282  
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:435
283  
-msgid "No"
284  
-msgstr "Nie"
285  
-
286  
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:435
287  
-=======
288 269
 #: contrib/admin/filterspecs.py:147 forms/widgets.py:431
289 270
 msgid "Yes"
290 271
 msgstr "Tak"
@@ -294,7 +275,6 @@ msgid "No"
294 275
 msgstr "Nie"
295 276
 
296 277
 #: contrib/admin/filterspecs.py:154 forms/widgets.py:431
297  
->>>>>>> master
298 278
 msgid "Unknown"
299 279
 msgstr "Nieznany"
300 280
 
@@ -339,15 +319,9 @@ msgstr "brak"
339 319
 msgid "Changed %s."
340 320
 msgstr "Zmieniono %s"
341 321
 
342  
-<<<<<<< HEAD
343  
-#: contrib/admin/options.py:519 contrib/admin/options.py:529
344  
-#: contrib/comments/templates/comments/preview.html:16 forms/models.py:384
345  
-#: forms/models.py:596
346  
-=======
347 322
 #: contrib/admin/options.py:540 contrib/admin/options.py:550
348 323
 #: contrib/comments/templates/comments/preview.html:16 forms/models.py:385
349 324
 #: forms/models.py:598
350  
->>>>>>> master
351 325
 msgid "and"
352 326
 msgstr "i"
353 327
 
@@ -370,57 +344,33 @@ msgstr "Usunięto %(name)s \"%(object)s\"."
370 344
 msgid "No fields changed."
371 345
 msgstr "Żadne pole nie zmienione."
372 346
 
373  
-<<<<<<< HEAD
374  
-#: contrib/admin/options.py:599 contrib/auth/admin.py:67
375  
-=======
376 347
 #: contrib/admin/options.py:620 contrib/auth/admin.py:68
377  
->>>>>>> master
378 348
 #, python-format
379 349
 msgid "The %(name)s \"%(obj)s\" was added successfully."
380 350
 msgstr "%(name)s \"%(obj)s\" dodany pomyślnie."
381 351
 
382  
-<<<<<<< HEAD
383  
-#: contrib/admin/options.py:603 contrib/admin/options.py:636
384  
-#: contrib/auth/admin.py:75
385  
-msgid "You may edit it again below."
386  
-msgstr "Możesz ponownie edytować wpis poniżej."
387  
-
388  
-#: contrib/admin/options.py:613 contrib/admin/options.py:646
389  
-=======
390 352
 #: contrib/admin/options.py:624 contrib/admin/options.py:657
391 353
 #: contrib/auth/admin.py:77
392 354
 msgid "You may edit it again below."
393 355
 msgstr "Możesz ponownie edytować wpis poniżej."
394 356
 
395 357
 #: contrib/admin/options.py:634 contrib/admin/options.py:667
396  
->>>>>>> master
397 358
 #, python-format
398 359
 msgid "You may add another %s below."
399 360
 msgstr "Możesz dodać nowy wpis %s poniżej."
400 361
 
401  
-<<<<<<< HEAD
402  
-#: contrib/admin/options.py:634
403  
-=======
404 362
 #: contrib/admin/options.py:655
405  
->>>>>>> master
406 363
 #, python-format
407 364
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
408 365
 msgstr "%(name)s \"%(obj)s\" zostało pomyślnie zmienione."
409 366
 
410  
-<<<<<<< HEAD
411  
-#: contrib/admin/options.py:642
412  
-=======
413 367
 #: contrib/admin/options.py:663
414  
->>>>>>> master
415 368
 #, python-format
416 369
 msgid ""
417 370
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
418 371
 msgstr ""
419 372
 "%(name)s \"%(obj)s\" dodane pomyślnie. Możesz edytować ponownie wpis poniżej."
420 373
 
421  
-<<<<<<< HEAD
422  
-#: contrib/admin/options.py:773
423  
-=======
424 374
 #: contrib/admin/options.py:714
425 375
 msgid ""
426 376
 "Items must be selected in order to perform actions on them. No items have "
@@ -433,42 +383,25 @@ msgid "No action selected."
433 383
 msgstr "Nie wybrano akcji."
434 384
 
435 385
 #: contrib/admin/options.py:808
436  
->>>>>>> master
437 386
 #, python-format
438 387
 msgid "Add %s"
439 388
 msgstr "Dodaj %s"
440 389
 
441  
-<<<<<<< HEAD
442  
-#: contrib/admin/options.py:804 contrib/admin/options.py:1005
443  
-=======
444 390
 #: contrib/admin/options.py:840 contrib/admin/options.py:1051
445  
->>>>>>> master
446 391
 #, python-format
447 392
 msgid "%(name)s object with primary key %(key)r does not exist."
448 393
 msgstr "Obiekt %(name)s o kluczu głównym %(key)r nie istnieje."
449 394
 
450  
-<<<<<<< HEAD
451  
-#: contrib/admin/options.py:861
452  
-=======
453 395
 #: contrib/admin/options.py:905
454  
->>>>>>> master
455 396
 #, python-format
456 397
 msgid "Change %s"
457 398
 msgstr "Zmień %s"
458 399
 
459  
-<<<<<<< HEAD
460  
-#: contrib/admin/options.py:905
461  
-msgid "Database error"
462  
-msgstr "Błąd bazy danych"
463  
-
464  
-#: contrib/admin/options.py:941
465  
-=======
466 400
 #: contrib/admin/options.py:950
467 401
 msgid "Database error"
468 402
 msgstr "Błąd bazy danych"
469 403
 
470 404
 #: contrib/admin/options.py:986
471  
->>>>>>> master
472 405
 #, python-format
473 406
 msgid "%(count)s %(name)s was changed successfully."
474 407
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -476,29 +409,17 @@ msgstr[0] "%(count)s %(name)s został pomyślnie zmieniony."
476 409
 msgstr[1] "%(count)s %(name)s zostały pomyślnie zmienione."
477 410
 msgstr[2] "%(count)s %(name)s zostało pomyślnie zmienionych."
478 411
 
479  
-<<<<<<< HEAD
480  
-#: contrib/admin/options.py:1020
481  
-=======
482 412
 #: contrib/admin/options.py:1066
483  
->>>>>>> master
484 413
 #, python-format
485 414
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
486 415
 msgstr "%(name)s \"%(obj)s\" usunięty pomyślnie."
487 416
 
488  
-<<<<<<< HEAD
489  
-#: contrib/admin/options.py:1057
490  
-=======
491 417
 #: contrib/admin/options.py:1103
492  
->>>>>>> master
493 418
 #, python-format
494 419
 msgid "Change history: %s"
495 420
 msgstr "Historia zmian: %s"
496 421
 
497  
-<<<<<<< HEAD
498  
-#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14
499  
-=======
500 422
 #: contrib/admin/sites.py:22 contrib/admin/views/decorators.py:14
501  
->>>>>>> master
502 423
 #: contrib/auth/forms.py:80
503 424
 msgid ""
504 425
 "Please enter a correct username and password. Note that both fields are case-"
@@ -507,19 +428,11 @@ msgstr ""
507 428
 "Proszę wpisać poprawną nazwę użytkownika i hasło. Uwaga: wielkość liter ma "
508 429
 "znaczenie."
509 430
 
510  
-<<<<<<< HEAD
511  
-#: contrib/admin/sites.py:288 contrib/admin/views/decorators.py:40
512  
-msgid "Please log in again, because your session has expired."
513  
-msgstr "Twoja sesja wygasła, zaloguj się ponownie."
514  
-
515  
-#: contrib/admin/sites.py:295 contrib/admin/views/decorators.py:47
516  
-=======
517 431
 #: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:40
518 432
 msgid "Please log in again, because your session has expired."
519 433
 msgstr "Twoja sesja wygasła, zaloguj się ponownie."
520 434
 
521 435
 #: contrib/admin/sites.py:299 contrib/admin/views/decorators.py:47
522  
->>>>>>> master
523 436
 msgid ""
524 437
 "Looks like your browser isn't configured to accept cookies. Please enable "
525 438
 "cookies, reload this page, and try again."
@@ -527,47 +440,27 @@ msgstr ""
527 440
 "Twoja przeglądarka nie chce akceptować ciasteczek. Zmień jej ustawienia i "
528 441
 "spróbuj ponownie."
529 442
 
530  
-<<<<<<< HEAD
531  
-#: contrib/admin/sites.py:311 contrib/admin/sites.py:317
532  
-=======
533 443
 #: contrib/admin/sites.py:315 contrib/admin/sites.py:321
534  
->>>>>>> master
535 444
 #: contrib/admin/views/decorators.py:66
536 445
 msgid "Usernames cannot contain the '@' character."
537 446
 msgstr "Nazwy użytkowników nie mogą zawierać znaku '@'."
538 447
 
539  
-<<<<<<< HEAD
540  
-#: contrib/admin/sites.py:314 contrib/admin/views/decorators.py:62
541  
-=======
542 448
 #: contrib/admin/sites.py:318 contrib/admin/views/decorators.py:62
543  
->>>>>>> master
544 449
 #, python-format
545 450
 msgid "Your e-mail address is not your username. Try '%s' instead."
546 451
 msgstr "Podany adres e-mail nie jest Twoją nazwą użytkownika. Spróbuj '%s'."
547 452
 
548  
-<<<<<<< HEAD
549  
-#: contrib/admin/sites.py:370
550  
-msgid "Site administration"
551  
-msgstr "Administracja stroną"
552  
-
553  
-#: contrib/admin/sites.py:384 contrib/admin/templates/admin/login.html:26
554  
-=======
555 453
 #: contrib/admin/sites.py:374
556 454
 msgid "Site administration"
557 455
 msgstr "Administracja stroną"
558 456
 
559 457
 #: contrib/admin/sites.py:388 contrib/admin/templates/admin/login.html:26
560  
->>>>>>> master
561 458
 #: contrib/admin/templates/registration/password_reset_complete.html:14
562 459
 #: contrib/admin/views/decorators.py:20
563 460
 msgid "Log in"
564 461
 msgstr "Zaloguj się"
565 462
 
566  
-<<<<<<< HEAD
567  
-#: contrib/admin/sites.py:429
568  
-=======
569 463
 #: contrib/admin/sites.py:433
570  
->>>>>>> master
571 464
 #, python-format
572 465
 msgid "%s administration"
573 466
 msgstr "%s - administracja"
@@ -598,19 +491,11 @@ msgstr "Teraz:"
598 491
 msgid "Change:"
599 492
 msgstr "Zmień:"
600 493
 
601  
-<<<<<<< HEAD
602  
-#: contrib/admin/widgets.py:125
603  
-msgid "Lookup"
604  
-msgstr "Szukaj"
605  
-
606  
-#: contrib/admin/widgets.py:237
607  
-=======
608 494
 #: contrib/admin/widgets.py:126
609 495
 msgid "Lookup"
610 496
 msgstr "Szukaj"
611 497
 
612 498
 #: contrib/admin/widgets.py:238
613  
->>>>>>> master
614 499
 msgid "Add Another"
615 500
 msgstr "Dodaj kolejny"
616 501
 
@@ -796,13 +681,8 @@ msgid ""
796 681
 "Are you sure you want to delete the selected %(object_name)s objects? All of "
797 682
 "the following objects and their related items will be deleted:"
798 683
 msgstr ""
799  
-<<<<<<< HEAD
800  
-"Czy chcesz skasować wybrane %(object_name)s? Następujące obiekty i zależne od "
801  
-"nich zostaną skasowane:"
802  
-=======
803 684
 "Czy chcesz skasować wybrane %(object_name)s? Następujące obiekty i zależne "
804 685
 "od nich zostaną skasowane:"
805  
->>>>>>> master
806 686
 
807 687
 #: contrib/admin/templates/admin/filter.html:2
808 688
 #, python-format
@@ -1181,92 +1061,7 @@ msgstr "liczba %s"
1181 1061
 msgid "Fields on %s objects"
1182 1062
 msgstr "Pola obiektów %s"
1183 1063
 
1184  
-<<<<<<< HEAD
1185  
-#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
1186  
-#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
1187  
-#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
1188  
-msgid "Integer"
1189  
-msgstr "Liczba całkowita"
1190  
-
1191  
-#: contrib/admindocs/views.py:335
1192  
-msgid "Boolean (Either True or False)"
1193  
-msgstr "Wartość logiczna (True, False - prawda lub fałsz)"
1194  
-
1195  
-#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
1196  
-#, python-format
1197  
-msgid "String (up to %(max_length)s)"
1198  
-msgstr "Łańcuch (do %(max_length)s znaków)"
1199  
-
1200  
-#: contrib/admindocs/views.py:337
1201  
-msgid "Comma-separated integers"
1202  
-msgstr "Liczby całkowite rozdzielone przecinkami"
1203  
-
1204  
-#: contrib/admindocs/views.py:338
1205  
-msgid "Date (without time)"
1206  
-msgstr "Data (bez godziny)"
1207  
-
1208  
-#: contrib/admindocs/views.py:339
1209  
-msgid "Date (with time)"
1210  
-msgstr "Data (z godziną)"
1211  
-
1212  
-#: contrib/admindocs/views.py:340
1213  
-msgid "Decimal number"
1214  
-msgstr "Liczba dziesiętna"
1215  
-
1216  
-#: contrib/admindocs/views.py:341
1217  
-msgid "E-mail address"
1218  
-msgstr "Adres e-mail"
1219  
-
1220  
-#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
1221  
-#: contrib/admindocs/views.py:346
1222  
-msgid "File path"
1223  
-msgstr "Ścieżka do pliku"
1224  
-
1225  
-#: contrib/admindocs/views.py:344
1226  
-msgid "Floating point number"
1227  
-msgstr "Liczba zmiennoprzecinkowa"
1228  
-
1229  
-#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
1230  
-msgid "IP address"
1231  
-msgstr "Adres IP"
1232  
-
1233  
-#: contrib/admindocs/views.py:350
1234  
-msgid "Boolean (Either True, False or None)"
1235  
-msgstr "Wartość logiczna (True, False, None - prawda, fałsz lub nic)"
1236  
-
1237  
-#: contrib/admindocs/views.py:351
1238  
-msgid "Relation to parent model"
1239  
-msgstr "Relacja do modelu rodzica"
1240  
-
1241  
-#: contrib/admindocs/views.py:352
1242  
-msgid "Phone number"
1243  
-msgstr "Numer telefonu"
1244  
-
1245  
-#: contrib/admindocs/views.py:357
1246  
-msgid "Text"
1247  
-msgstr "Tekst"
1248  
-
1249  
-#: contrib/admindocs/views.py:358
1250  
-msgid "Time"
1251  
-msgstr "Czas"
1252  
-
1253  
-#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
1254  
-#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
1255  
-msgid "URL"
1256  
-msgstr "URL"
1257  
-
1258  
-#: contrib/admindocs/views.py:360
1259  
-msgid "U.S. state (two uppercase letters)"
1260  
-msgstr "Stan USA (dwie duże litery)"
1261  
-
1262  
-#: contrib/admindocs/views.py:361
1263  
-msgid "XML text"
1264  
-msgstr "Tekst XML"
1265  
-
1266  
-#: contrib/admindocs/views.py:387
1267  
-=======
1268 1064
 #: contrib/admindocs/views.py:356
1269  
->>>>>>> master
1270 1065
 #, python-format
1271 1066
 msgid "%s does not appear to be a urlpattern object"
1272 1067
 msgstr "%s nie jest obiektem urlpattern"
@@ -1556,19 +1351,11 @@ msgstr "użytkownicy"
1556 1351
 msgid "message"
1557 1352
 msgstr "wiadomość"
1558 1353
 
1559  
-<<<<<<< HEAD
1560  
-#: contrib/auth/views.py:58
1561  
-msgid "Logged out"
1562  
-msgstr "Wylogowany"
1563  
-
1564  
-#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:428
1565  
-=======
1566 1354
 #: contrib/auth/views.py:60
1567 1355
 msgid "Logged out"
1568 1356
 msgstr "Wylogowany"
1569 1357
 
1570 1358
 #: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:414
1571  
->>>>>>> master
1572 1359
 msgid "Enter a valid e-mail address."
1573 1360
 msgstr "Wprowadź poprawny adres e-mail."
1574 1361
 
@@ -4278,9 +4065,6 @@ msgstr "Czas"
4278 4065
 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
4279 4066
 msgstr "Proszę wpisać poprawną godzinę w formacie HH:MM[:ss[.uuuuuu]]."
4280 4067
 
4281  
-<<<<<<< HEAD
4282  
-#: db/models/fields/related.py:816
4283  
-=======
4284 4068
 #: db/models/fields/__init__.py:999
4285 4069
 msgid "XML text"
4286 4070
 msgstr "Tekst XML"
@@ -4298,18 +4082,13 @@ msgid "Many-to-many relationship"
4298 4082
 msgstr "Powiązanie wiele do wiele"
4299 4083
 
4300 4084
 #: db/models/fields/related.py:889
4301  
->>>>>>> master
4302 4085
 msgid ""
4303 4086
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
4304 4087
 msgstr ""
4305 4088
 "Przytrzymaj wciśnięty klawisz \"Ctrl\" lub \"Command\" na Mac'u aby "
4306 4089
 "zaznaczyć więcej niż jeden wybór."
4307 4090
 
4308  
-<<<<<<< HEAD
4309  
-#: db/models/fields/related.py:894
4310  
-=======
4311 4091
 #: db/models/fields/related.py:950
4312  
->>>>>>> master
4313 4092
 #, python-format
4314 4093
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
4315 4094
 msgid_plural ""
@@ -4324,17 +4103,6 @@ msgstr[2] ""
4324 4103
 "Proszę podać poprawne identyfikatory %(self)s. Wartości %(value)r są "
4325 4104
 "niepoprawne."
4326 4105
 
4327  
-<<<<<<< HEAD
4328  
-#: forms/fields.py:53
4329  
-msgid "This field is required."
4330  
-msgstr "To pole jest wymagane."
4331  
-
4332  
-#: forms/fields.py:54
4333  
-msgid "Enter a valid value."
4334  
-msgstr "Wpisz poprawną wartość."
4335  
-
4336  
-#: forms/fields.py:137
4337  
-=======
4338 4106
 #: forms/fields.py:60
4339 4107
 msgid "This field is required."
4340 4108
 msgstr "To pole jest wymagane."
@@ -4344,112 +4112,52 @@ msgid "Enter a valid value."
4344 4112
 msgstr "Wpisz poprawną wartość."
4345 4113
 
4346 4114
 #: forms/fields.py:144
4347  
->>>>>>> master
4348 4115
 #, python-format
4349 4116
 msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
4350 4117
 msgstr ""
4351 4118
 "Upewnij się, że ta wartość ma co najwyżej %(max)d znaków (ma długość %"
4352 4119
 "(length)d)."
4353 4120
 
4354  
-<<<<<<< HEAD
4355  
-#: forms/fields.py:138
4356  
-=======
4357 4121
 #: forms/fields.py:145
4358  
->>>>>>> master
4359 4122
 #, python-format
4360 4123
 msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
4361 4124
 msgstr ""
4362 4125
 "Upewnij się, że ta wartość ma co najmniej %(min)d znaków (ma długość %"
4363 4126
 "(length)d)."
4364 4127
 
4365  
-<<<<<<< HEAD
4366  
-#: forms/fields.py:165
4367  
-msgid "Enter a whole number."
4368  
-msgstr "Wpisz liczbę całkowitą."
4369  
-
4370  
-#: forms/fields.py:166 forms/fields.py:195 forms/fields.py:224
4371  
-=======
4372 4128
 #: forms/fields.py:172
4373 4129
 msgid "Enter a whole number."
4374 4130
 msgstr "Wpisz liczbę całkowitą."
4375 4131
 
4376 4132
 #: forms/fields.py:173 forms/fields.py:202 forms/fields.py:233
4377  
->>>>>>> master
4378 4133
 #, python-format
4379 4134
 msgid "Ensure this value is less than or equal to %s."
4380 4135
 msgstr "Upewnij się, że ta wartość jest mniejsza lub równa %s."
4381 4136
 
4382  
-<<<<<<< HEAD
4383  
-#: forms/fields.py:167 forms/fields.py:196 forms/fields.py:225
4384  
-=======
4385 4137
 #: forms/fields.py:174 forms/fields.py:203 forms/fields.py:234
4386  
->>>>>>> master
4387 4138
 #, python-format
4388 4139
 msgid "Ensure this value is greater than or equal to %s."
4389 4140
 msgstr "Upewnij się, że ta wartość jest większa lub równa %s."
4390 4141
 
4391  
-<<<<<<< HEAD
4392  
-#: forms/fields.py:194 forms/fields.py:223
4393  
-msgid "Enter a number."
4394  
-msgstr "Wpisz liczbę."
4395  
-
4396  
-#: forms/fields.py:226
4397  
-=======
4398 4142
 #: forms/fields.py:201 forms/fields.py:232
4399 4143
 msgid "Enter a number."
4400 4144
 msgstr "Wpisz liczbę."
4401 4145
 
4402 4146
 #: forms/fields.py:235
4403  
->>>>>>> master
4404 4147
 #, python-format
4405 4148
 msgid "Ensure that there are no more than %s digits in total."
4406 4149
 msgstr "Upewnij się, że jest nie więcej niż %s cyfr."
4407 4150
 
4408  
-<<<<<<< HEAD
4409  
-#: forms/fields.py:227
4410  
-=======
4411 4151
 #: forms/fields.py:236
4412  
->>>>>>> master
4413 4152
 #, python-format
4414 4153
 msgid "Ensure that there are no more than %s decimal places."
4415 4154
 msgstr "Upewnij się, że jest nie więcej niż %s miejsc po przecinku."
4416 4155
 
4417  
-<<<<<<< HEAD
4418  
-#: forms/fields.py:228
4419  
-=======
4420 4156
 #: forms/fields.py:237
4421  
->>>>>>> master
4422 4157
 #, python-format
4423 4158
 msgid "Ensure that there are no more than %s digits before the decimal point."
4424 4159
 msgstr "Upewnij się, że jest nie więcej niż %s miejsc przed przecinkiem."
4425 4160
 
4426  
-<<<<<<< HEAD
4427  
-#: forms/fields.py:287 forms/fields.py:862
4428  
-msgid "Enter a valid date."
4429  
-msgstr "Wpisz poprawną datę."
4430  
-
4431  
-#: forms/fields.py:321 forms/fields.py:863
4432  
-msgid "Enter a valid time."
4433  
-msgstr "Wpisz poprawną godzinę."
4434  
-
4435  
-#: forms/fields.py:360
4436  
-msgid "Enter a valid date/time."
4437  
-msgstr "Wpisz poprawną datę/godzinę."
4438  
-
4439  
-#: forms/fields.py:446
4440  
-msgid "No file was submitted. Check the encoding type on the form."
4441  
-msgstr "Nie wysłano żadnego pliku. Sprawdź typ kodowania formularza."
4442  
-
4443  
-#: forms/fields.py:447
4444  
-msgid "No file was submitted."
4445  
-msgstr "Żaden plik nie został przesłany."
4446  
-
4447  
-#: forms/fields.py:448
4448  
-msgid "The submitted file is empty."
4449  
-msgstr "Wysłany plik jest pusty."
4450  
-
4451  
-#: forms/fields.py:449
4452  
-=======
4453 4161
 #: forms/fields.py:290 forms/fields.py:848
4454 4162
 msgid "Enter a valid date."
4455 4163
 msgstr "Wpisz poprawną datę."
@@ -4475,7 +4183,6 @@ msgid "The submitted file is empty."
4475 4183
 msgstr "Wysłany plik jest pusty."
4476 4184
 
4477 4185
 #: forms/fields.py:435
4478  
->>>>>>> master
4479 4186
 #, python-format
4480 4187
 msgid ""
4481 4188
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -4483,11 +4190,7 @@ msgstr ""
4483 4190
 "Upewnij się, że nazwa tego pliku ma co najwyżej %(max)d znaków (ma długość %"
4484 4191
 "(length)d)."
4485 4192
 
4486  
-<<<<<<< HEAD
4487  
-#: forms/fields.py:482
4488  
-=======
4489 4193
 #: forms/fields.py:468
4490  
->>>>>>> master
4491 4194
 msgid ""
4492 4195
 "Upload a valid image. The file you uploaded was either not an image or a "
4493 4196
 "corrupted image."
@@ -4495,17 +4198,6 @@ msgstr ""
4495 4198
 "Wgraj poprawny plik graficzny. Ten, który został wgrany, nie jest obrazem, "
4496 4199
 "albo jest uszkodzony."
4497 4200
 
4498  
-<<<<<<< HEAD
4499  
-#: forms/fields.py:543
4500  
-msgid "Enter a valid URL."
4501  
-msgstr "Wpisz poprawny URL."
4502  
-
4503  
-#: forms/fields.py:544
4504  
-msgid "This URL appears to be a broken link."
4505  
-msgstr "Ten odnośnik jest nieprawidłowy."
4506  
-
4507  
-#: forms/fields.py:624 forms/fields.py:702
4508  
-=======
4509 4201
 #: forms/fields.py:529
4510 4202
 msgid "Enter a valid URL."
4511 4203
 msgstr "Wpisz poprawny URL."
@@ -4515,23 +4207,11 @@ msgid "This URL appears to be a broken link."
4515 4207
 msgstr "Ten odnośnik jest nieprawidłowy."
4516 4208
 
4517 4209
 #: forms/fields.py:610 forms/fields.py:688
4518  
->>>>>>> master
4519 4210
 #, python-format
4520 4211
 msgid "Select a valid choice. %(value)s is not one of the available choices."
4521 4212
 msgstr ""
4522 4213
 "Wybierz poprawną wartość. %(value)s nie jest jednym z dostępnych wyborów."
4523 4214
 
4524  
-<<<<<<< HEAD
4525  
-#: forms/fields.py:703 forms/fields.py:764 forms/models.py:999
4526  
-msgid "Enter a list of values."
4527  
-msgstr "Podaj listę wartości."
4528  
-
4529  
-#: forms/fields.py:891
4530  
-msgid "Enter a valid IPv4 address."
4531  
-msgstr "Wprowadź poprawny adres IPv4."
4532  
-
4533  
-#: forms/fields.py:901
4534  
-=======
4535 4215
 #: forms/fields.py:689 forms/fields.py:750 forms/models.py:1007
4536 4216
 msgid "Enter a list of values."
4537 4217
 msgstr "Podaj listę wartości."
@@ -4541,7 +4221,6 @@ msgid "Enter a valid IPv4 address."
4541 4221
 msgstr "Wprowadź poprawny adres IPv4."
4542 4222
 
4543 4223
 #: forms/fields.py:887
4544  
->>>>>>> master
4545 4224
 msgid ""
4546 4225
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
4547 4226
 msgstr "To pole może zawierać jedynie litery, cyfry, podkreślenia i myślniki."
@@ -4550,49 +4229,29 @@ msgstr "To pole może zawierać jedynie litery, cyfry, podkreślenia i myślniki
4550 4229
 msgid "Order"
4551 4230
 msgstr "Porządek"
4552 4231
 
4553  
-<<<<<<< HEAD
4554  
-#: forms/models.py:363
4555  
-=======
4556 4232
 #: forms/models.py:364
4557  
->>>>>>> master
4558 4233
 #, python-format
4559 4234
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
4560 4235
 msgstr ""
4561 4236
 "Wartości w %(field_name)s muszą być unikalne dla wyszukiwań %(lookup)s w %"
4562 4237
 "(date_field)s"
4563 4238
 
4564  
-<<<<<<< HEAD
4565  
-#: forms/models.py:377 forms/models.py:385
4566  
-=======
4567 4239
 #: forms/models.py:378 forms/models.py:386
4568  
->>>>>>> master
4569 4240
 #, python-format
4570 4241
 msgid "%(model_name)s with this %(field_label)s already exists."
4571 4242
 msgstr "%(field_label)s już istnieje w %(model_name)s."
4572 4243
 
4573  
-<<<<<<< HEAD
4574  
-#: forms/models.py:590
4575  
-=======
4576 4244
 #: forms/models.py:592
4577  
->>>>>>> master
4578 4245
 #, python-format
4579 4246
 msgid "Please correct the duplicate data for %(field)s."
4580 4247
 msgstr "Popraw zduplikowane dane w %(field)s."
4581 4248
 
4582  
-<<<<<<< HEAD
4583  
-#: forms/models.py:594
4584  
-=======
4585 4249
 #: forms/models.py:596
4586  
->>>>>>> master
4587 4250
 #, python-format
4588 4251
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
4589 4252
 msgstr "Popraw zduplikowane dane w %(field)s, które wymaga unikalności."
4590 4253
 
4591  
-<<<<<<< HEAD
4592  
-#: forms/models.py:600
4593  
-=======
4594 4254
 #: forms/models.py:602
4595  
->>>>>>> master
4596 4255
 #, python-format
4597 4256
 msgid ""
4598 4257
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -4601,21 +4260,6 @@ msgstr ""
4601 4260
 "Popraw zduplikowane dane w %(field_name)s, które wymaga unikalności dla %"
4602 4261
 "(lookup)s w polu %(date_field)s."
4603 4262
 
4604  
-<<<<<<< HEAD
4605  
-#: forms/models.py:608
4606  
-msgid "Please correct the duplicate values below."
4607  
-msgstr "Popraw poniższe zduplikowane wartości."
4608  
-
4609  
-#: forms/models.py:863
4610  
-msgid "The inline foreign key did not match the parent instance primary key."
4611  
-msgstr "Osadzony klucz obcy nie pasuje do klucza głównego obiektu rodzica."
4612  
-
4613  
-#: forms/models.py:926
4614  
-msgid "Select a valid choice. That choice is not one of the available choices."
4615  
-msgstr "Wybierz poprawną wartość. Podana nie jest jednym z dostępnych wyborów."
4616  
-
4617  
-#: forms/models.py:1000
4618  
-=======
4619 4263
 #: forms/models.py:610
4620 4264
 msgid "Please correct the duplicate values below."
4621 4265
 msgstr "Popraw poniższe zduplikowane wartości."
@@ -4629,16 +4273,11 @@ msgid "Select a valid choice. That choice is not one of the available choices."
4629 4273
 msgstr "Wybierz poprawną wartość. Podana nie jest jednym z dostępnych wyborów."
4630 4274
 
4631 4275
 #: forms/models.py:1008
4632  
->>>>>>> master
4633 4276
 #, python-format
4634 4277
 msgid "Select a valid choice. %s is not one of the available choices."
4635 4278
 msgstr "Wybierz poprawną wartość. %s nie jest jednym z dostępnych wyborów."
4636 4279
 
4637  
-<<<<<<< HEAD
4638  
-#: forms/models.py:1002
4639  
-=======
4640 4280
 #: forms/models.py:1010
4641  
->>>>>>> master
4642 4281
 #, python-format
4643 4282
 msgid "\"%s\" is not a valid value for a primary key."
4644 4283
 msgstr "\"%s\" nie jest poprawną wartością klucza głównego."
@@ -4969,12 +4608,9 @@ msgstr "%(verbose_name)s zostało pomyślnie zmienione."
4969 4608
 msgid "The %(verbose_name)s was deleted."
4970 4609
 msgstr "%(verbose_name)s zostało usunięte."
4971 4610
 
4972  
-<<<<<<< HEAD
4973  
-=======
4974 4611
 #~ msgid "Relation to parent model"
4975 4612
 #~ msgstr "Relacja do modelu rodzica"
4976 4613
 
4977  
->>>>>>> master
4978 4614
 #~ msgid "Comment moderation queue"
4979 4615
 #~ msgstr "Kolejka moderacji komentarzy"
4980 4616
 
202  django/contrib/gis/db/models/sql/query.py
@@ -9,11 +9,6 @@
9 9
 from django.contrib.gis.measure import Area, Distance
10 10
 
11 11
 
12  
-<<<<<<< HEAD
13  
-# Pulling out other needed constants/routines to avoid attribute lookups.
14  
-TABLE_NAME = sql.constants.TABLE_NAME
15  
-get_proxied_model = sql.query.get_proxied_model
16  
-=======
17 12
 ALL_TERMS = dict([(x, None) for x in (
18 13
             'bbcontains', 'bboverlaps', 'contained', 'contains',
19 14
             'contains_properly', 'coveredby', 'covers', 'crosses', 'disjoint',
@@ -25,7 +20,6 @@
25 20
             'strictly_above', 'strictly_below'
26 21
             )])
27 22
 ALL_TERMS.update(sql.constants.QUERY_TERMS)
28  
->>>>>>> master
29 23
 
30 24
 class GeoQuery(sql.Query):
31 25
     """
@@ -56,198 +50,8 @@ def clone(self, *args, **kwargs):
56 50
         obj.extra_select_fields = self.extra_select_fields.copy()
57 51
         return obj
58 52
 
59  
-<<<<<<< HEAD
60  
-    def get_columns(self, with_aliases=False):
61  
-        """
62  
-        Return the list of columns to use in the select statement. If no
63  
-        columns have been specified, returns all columns relating to fields in
64  
-        the model.
65  
-
66  
-        If 'with_aliases' is true, any column names that are duplicated
67  
-        (without the table names) are given unique aliases. This is needed in
68  
-        some cases to avoid ambiguitity with nested queries.
69  
-
70  
-        This routine is overridden from Query to handle customized selection of
71  
-        geometry columns.
72  
-        """
73  
-        qn = self.quote_name_unless_alias
74  
-        qn2 = self.connection.ops.quote_name
75  
-        result = ['(%s) AS %s' % (self.get_extra_select_format(alias) % col[0], qn2(alias))
76  
-                  for alias, col in self.extra_select.iteritems()]
77  
-        aliases = set(self.extra_select.keys())
78  
-        if with_aliases:
79  
-            col_aliases = aliases.copy()
80  
-        else:
81  
-            col_aliases = set()
82  
-        if self.select:
83  
-            only_load = self.deferred_to_columns()
84  
-            # This loop customized for GeoQuery.
85  
-            for col, field in izip(self.select, self.select_fields):
86  
-                if isinstance(col, (list, tuple)):
87  
-                    alias, column = col
88  
-                    table = self.alias_map[alias][TABLE_NAME]
89  
-                    if table in only_load and col not in only_load[table]:
90  
-                        continue
91  
-                    r = self.get_field_select(field, alias, column)
92  
-                    if with_aliases:
93  
-                        if col[1] in col_aliases:
94  
-                            c_alias = 'Col%d' % len(col_aliases)
95  
-                            result.append('%s AS %s' % (r, c_alias))
96  
-                            aliases.add(c_alias)
97  
-                            col_aliases.add(c_alias)
98  
-                        else:
99  
-                            result.append('%s AS %s' % (r, qn2(col[1])))
100  
-                            aliases.add(r)
101  
-                            col_aliases.add(col[1])
102  
-                    else:
103  
-                        result.append(r)
104  
-                        aliases.add(r)
105  
-                        col_aliases.add(col[1])
106  
-                else:
107  
-                    result.append(col.as_sql(quote_func=qn))
108  
-
109  
-                    if hasattr(col, 'alias'):
110  
-                        aliases.add(col.alias)
111  
-                        col_aliases.add(col.alias)
112  
-
113  
-        elif self.default_cols:
114  
-            cols, new_aliases = self.get_default_columns(with_aliases,
115  
-                    col_aliases)
116  
-            result.extend(cols)
117  
-            aliases.update(new_aliases)
118  
-
119  
-        result.extend([
120  
-                '%s%s' % (
121  
-                    self.get_extra_select_format(alias) % aggregate.as_sql(quote_func=qn),
122  
-                    alias is not None and ' AS %s' % alias or ''
123  
-                    )
124  
-                for alias, aggregate in self.aggregate_select.items()
125  
-        ])
126  
-
127  
-        # This loop customized for GeoQuery.
128  
-        for (table, col), field in izip(self.related_select_cols, self.related_select_fields):
129  
-            r = self.get_field_select(field, table, col)
130  
-            if with_aliases and col in col_aliases:
131  
-                c_alias = 'Col%d' % len(col_aliases)
132  
-                result.append('%s AS %s' % (r, c_alias))
133  
-                aliases.add(c_alias)
134  
-                col_aliases.add(c_alias)
135  
-            else:
136  
-                result.append(r)
137  
-                aliases.add(r)
138  
-                col_aliases.add(col)
139  
-
140  
-        self._select_aliases = aliases
141  
-        return result
142  
-
143  
-    def get_default_columns(self, with_aliases=False, col_aliases=None,
144  
-                            start_alias=None, opts=None, as_pairs=False):
145  
-        """
146  
-        Computes the default columns for selecting every field in the base
147  
-        model. Will sometimes be called to pull in related models (e.g. via
148  
-        select_related), in which case "opts" and "start_alias" will be given
149  
-        to provide a starting point for the traversal.
150  
-
151  
-        Returns a list of strings, quoted appropriately for use in SQL
152  
-        directly, as well as a set of aliases used in the select statement (if
153  
-        'as_pairs' is True, returns a list of (alias, col_name) pairs instead
154  
-        of strings as the first component and None as the second component).
155  
-
156  
-        This routine is overridden from Query to handle customized selection of
157  
-        geometry columns.
158  
-        """
159  
-        result = []
160  
-        if opts is None:
161  
-            opts = self.model._meta
162  
-        aliases = set()
163  
-        only_load = self.deferred_to_columns()
164  
-        # Skip all proxy to the root proxied model
165  
-        proxied_model = get_proxied_model(opts)
166  
-
167  
-        if start_alias:
168  
-            seen = {None: start_alias}
169  
-        for field, model in opts.get_fields_with_model():
170  
-            if start_alias:
171  
-                try:
172  
-                    alias = seen[model]
173  
-                except KeyError:
174  
-                    if model is proxied_model:
175  
-                        alias = start_alias
176  
-                    else:
177  
-                        link_field = opts.get_ancestor_link(model)
178  
-                        alias = self.join((start_alias, model._meta.db_table,
179  
-                                           link_field.column, model._meta.pk.column))
180  
-                    seen[model] = alias
181  
-            else:
182  
-                # If we're starting from the base model of the queryset, the
183  
-                # aliases will have already been set up in pre_sql_setup(), so
184  
-                # we can save time here.
185  
-                alias = self.included_inherited_models[model]
186  
-            table = self.alias_map[alias][TABLE_NAME]
187  
-            if table in only_load and field.column not in only_load[table]:
188  
-                continue
189  
-            if as_pairs:
190  
-                result.append((alias, field.column))
191  
-                aliases.add(alias)
192  
-                continue
193  
-            # This part of the function is customized for GeoQuery. We
194  
-            # see if there was any custom selection specified in the
195  
-            # dictionary, and set up the selection format appropriately.
196  
-            field_sel = self.get_field_select(field, alias)
197  
-            if with_aliases and field.column in col_aliases:
198  
-                c_alias = 'Col%d' % len(col_aliases)
199  
-                result.append('%s AS %s' % (field_sel, c_alias))
200  
-                col_aliases.add(c_alias)
201  
-                aliases.add(c_alias)
202  
-            else:
203  
-                r = field_sel
204  
-                result.append(r)
205  
-                aliases.add(r)
206  
-                if with_aliases:
207  
-                    col_aliases.add(field.column)
208  
-        return result, aliases
209  
-
210  
-    def resolve_columns(self, row, fields=()):
211  
-        """
212  
-        This routine is necessary so that distances and geometries returned
213  
-        from extra selection SQL get resolved appropriately into Python
214  
-        objects.
215  
-        """
216  
-        values = []
217  
-        aliases = self.extra_select.keys()
218  
-        if self.aggregates:
219  
-            # If we have an aggregate annotation, must extend the aliases
220  
-            # so their corresponding row values are included.
221  
-            aliases.extend([None for i in xrange(len(self.aggregates))])
222  
-
223  
-        # Have to set a starting row number offset that is used for
224  
-        # determining the correct starting row index -- needed for
225  
-        # doing pagination with Oracle.
226  
-        rn_offset = 0
227  
-        if SpatialBackend.oracle:
228  
-            if self.high_mark is not None or self.low_mark: rn_offset = 1
229  
-        index_start = rn_offset + len(aliases)
230  
-
231  
-        # Converting any extra selection values (e.g., geometries and
232  
-        # distance objects added by GeoQuerySet methods).
233  
-        values = [self.convert_values(v, self.extra_select_fields.get(a, None))
234  
-                  for v, a in izip(row[rn_offset:index_start], aliases)]
235  
-        if SpatialBackend.oracle or getattr(self, 'geo_values', False):
236  
-            # We resolve the rest of the columns if we're on Oracle or if
237  
-            # the `geo_values` attribute is defined.
238  
-            for value, field in izip(row[index_start:], fields):
239  
-                values.append(self.convert_values(value, field))
240  
-        else:
241  
-            values.extend(row[index_start:])
242  
-        return tuple(values)
243  
-
244  
-    def convert_values(self, value, field):
245  
-        """
246  
-        Using the same routines that Oracle does we can convert our
247  
-=======
248 53
     def convert_values(self, value, field, connection):
249 54
         """        Using the same routines that Oracle does we can convert our
250  
->>>>>>> master
251 55
         extra selection objects into Geometry and Distance objects.
252 56
         TODO: Make converted objects 'lazy' for less overhead.
253 57
         """
@@ -283,15 +87,9 @@ def resolve_aggregate(self, value, aggregate, connection):
283 87
         if isinstance(aggregate, self.aggregates_module.GeoAggregate):
284 88
             if aggregate.is_extent:
285 89
                 if aggregate.is_extent == '3D':
286  
-<<<<<<< HEAD
287  
-                    return self.aggregates_module.convert_extent3d(value)
288  
-                else:
289  
-                    return self.aggregates_module.convert_extent(value)
290  
-=======
291 90
                     return connection.ops.convert_extent3d(value)
292 91
                 else:
293 92
                     return connection.ops.convert_extent(value)
294  
->>>>>>> master
295 93
             else:
296 94
                 return connection.ops.convert_geom(value, aggregate.source)
297 95
         else:
11  docs/ref/models/querysets.txt
@@ -1147,17 +1147,6 @@ more overall work (an additional query) than simply using
1147 1147
 
1148 1148
 .. _field-lookups:
1149 1149
 
1150  
-``exists()``
1151  
-~~~~~~~~~~~~
1152  
-
1153  
-.. versionadded:: 1.2
1154  
-
1155  
-Returns ``True`` if the :class:`QuerySet` contains any results, and ``False``
1156  
-if not. This tries to perform the query in the simplest and fastest way
1157  
-possible, but it *does* execute nearly the same query. This means that calling
1158  
-:meth:`QuerySet.exists()` is faster that ``bool(some_query_set)``, but not by
1159  
-a large degree.
1160  
-
1161 1150
 Field lookups
1162 1151
 -------------
1163 1152
 
10  docs/ref/templates/builtins.txt
@@ -65,16 +65,6 @@ Forgeries <ref-contrib-csrf>`.
65 65
 
66 66
 .. templatetag:: cycle
67 67
 
68  
-csrf_token
69  
-~~~~~~~~~~
70  
-
71  
-.. versionadded:: 1.1.2
72  
-
73  
-In the Django 1.1.X series, this is a no-op tag that returns an empty string for
74  
-future compatibility purposes.  In Django 1.2 and later, it is used for CSRF
75  
-protection, as described in the documentation for :ref:`Cross Site Request
76  
-Forgeries <ref-contrib-csrf>`.
77  
-
78 68
 cycle
79 69
 ~~~~~
80 70
 

0 notes on commit 8c62b72

Please sign in to comment.
Something went wrong with that request. Please try again.