Browse files

Merge remote branch 'upstream/master'

  • Loading branch information...
2 parents b3bcc87 + f447066 commit 27cc0c173ea66a5a26d55b044d1d5a8867697056 @Chanaka Chanaka committed May 15, 2012
Showing with 12,833 additions and 127 deletions.
  1. +1 −0 ChangeLog
  2. +7 −6 libraries/config/validate.lib.php
  3. +1 −1 libraries/display_change_password.lib.php
  4. +2 −2 libraries/header_http.inc.php
  5. +2 −0 libraries/select_lang.lib.php
  6. +12,529 −0 po/ckb.po
  7. +6 −4 po/cs.po
  8. +133 −65 po/pl.po
  9. +5 −5 po/pt.po
  10. +22 −12 po/ro.po
  11. +125 −32 test/classes/PMA_Message_test.php
View
1 ChangeLog
@@ -49,6 +49,7 @@ VerboseMultiSubmit, ReplaceHelpImg
- bug [GUI] Invalid HTML code on transformation_overview.php
- bug #3522930 [browse] Missing validation in Ajax mode
- bug Fix popup message on build SQL of import
+- bug #3523499 [core] Make X-WebKit-CSP work better
3.5.1.0 (2012-05-03)
- bug #3510784 [edit] Limit clause ignored when sort order is remembered
View
13 libraries/config/validate.lib.php
@@ -66,9 +66,10 @@ function PMA_config_get_validators()
* cleanup in HTML documen
* o false - when no validators match name(s) given by $validator_id
*
- * @param string|array $validator_id
- * @param array $values
- * @param bool $isPostSource tells whether $values are directly from POST request
+ * @param string|array $validator_id ID of validator(s) to run
+ * @param array $values Values to validate
+ * @param bool $isPostSource tells whether $values are directly from
+ * POST request
*
* @return bool|array
*/
@@ -150,7 +151,7 @@ function PMA_null_error_handler()
* Called with $start = false disables output buffering end restores
* html_errors and track_errors.
*
- * @param boolean $start
+ * @param boolean $start Whether to start buffering
*/
function test_php_errormsg($start = true)
{
@@ -179,8 +180,8 @@ function test_php_errormsg($start = true)
/**
* Test database connection
*
- * @param string $extension 'drizzle', 'mysql' or 'mysqli'
- * @param string $connect_type 'tcp' or 'socket'
+ * @param string $extension 'drizzle', 'mysql' or 'mysqli'
+ * @param string $connect_type 'tcp' or 'socket'
* @param string $host
* @param string $port
* @param string $socket
View
2 libraries/display_change_password.lib.php
@@ -13,7 +13,7 @@
* autocomplete feature of IE kills the "onchange" event handler and it
* must be replaced by the "onpropertychange" one in this case
*/
-$chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
+$chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5 && PMA_USR_BROWSER_VER < 7)
? 'onpropertychange'
: 'onchange';
View
4 libraries/header_http.inc.php
@@ -22,8 +22,8 @@
/* Prevent against ClickJacking by allowing frames only from same origin */
if (!$GLOBALS['cfg']['AllowThirdPartyFraming']) {
header('X-Frame-Options: SAMEORIGIN');
- header('X-Content-Security-Policy: allow \'self\'; options inline-script eval-script; frame-ancestors \'self\'; img-src \'self\' data:; script-src \'self\' http://www.phpmyadmin.net');
- header('X-WebKit-CSP: default-src \'self\' \'unsafe-inline\'; img-src \'self\' data:; script-src \'self\' \'unsafe-inline\' \'unsafe-eval\' http://www.phpmyadmin.net');
+ header("X-Content-Security-Policy: allow 'self'; options inline-script eval-script; frame-ancestors 'self'; img-src 'self' data:; script-src 'self' http://www.phpmyadmin.net");
+ header("X-WebKit-CSP: allow 'self' http://www.phpmyadmin.net; options inline-script eval-script");
}
PMA_no_cache_header();
if (!defined('IS_TRANSFORMATION_WRAPPER')) {
View
2 libraries/select_lang.lib.php
@@ -217,6 +217,8 @@ function PMA_langDetails($lang)
return array('br|breton', 'br', 'Brezhoneg');
case 'ca':
return array('ca|catalan', 'ca', 'Catal&agrave;');
+ case 'ckb':
+ return array('ckb', 'ckb', 'سۆرانی');
case 'cs':
return array('cs|czech', 'cs', 'Čeština');
case 'cy':
View
12,529 po/ckb.po
12,529 additions, 0 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
10 po/cs.po
@@ -6,15 +6,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-05-09 13:14+0200\n"
-"PO-Revision-Date: 2012-05-09 13:27+0200\n"
+"PO-Revision-Date: 2012-05-15 13:39+0200\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: czech <cs@li.org>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 0.10\n"
+"X-Generator: Weblate 1.0\n"
#: browse_foreigners.php:35 browse_foreigners.php:59 js/messages.php:358
#: libraries/display_tbl.lib.php:399 server_privileges.php:1828
@@ -2834,7 +2834,7 @@ msgstr ""
msgid ""
"Synonym for DOUBLE (exception: in REAL_AS_FLOAT SQL mode it is a synonym for "
"FLOAT)"
-msgstr ""
+msgstr "Synonymum pro DOUBLE (v případě SQL režimu REAL_AS_FLOAT pro FLOAT)"
#: libraries/Types.class.php:307
msgid ""
@@ -2847,10 +2847,12 @@ msgid ""
"A synonym for TINYINT(1), a value of zero is considered false, nonzero "
"values are considered true"
msgstr ""
+"Synonymum pro TINYINT(1), nula je považována ze nepravdu, jakékoliv jiné "
+"hodnoty za pravdu"
#: libraries/Types.class.php:311
msgid "An alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE"
-msgstr ""
+msgstr "Zkratka pro BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE"
#: libraries/Types.class.php:313 libraries/Types.class.php:717
#, php-format
View
198 po/pl.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-05-09 13:14+0200\n"
-"PO-Revision-Date: 2012-04-21 16:04+0200\n"
+"PO-Revision-Date: 2012-05-14 15:30+0200\n"
"Last-Translator: Marcin Kozioł <lord_dark@wp.pl>\n"
"Language-Team: iMutrix\n"
"Language: pl\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 0.10\n"
+"X-Generator: Weblate 1.0\n"
#: browse_foreigners.php:35 browse_foreigners.php:59 js/messages.php:358
#: libraries/display_tbl.lib.php:399 server_privileges.php:1828
@@ -1497,10 +1497,9 @@ msgid "From general log"
msgstr "Z dziennika ogólnego"
#: js/messages.php:172
-#, fuzzy
#| msgid "Loading logs"
msgid "Analysing logs"
-msgstr "Ładowanie logów"
+msgstr "Analizowanie logów"
#: js/messages.php:173
msgid "Analysing & loading logs. This may take a while."
@@ -1539,10 +1538,9 @@ msgid "Jump to Log table"
msgstr "Przejdź do dziennika tabeli"
#: js/messages.php:180
-#, fuzzy
#| msgid "No data"
msgid "No data found"
-msgstr "Brak danych"
+msgstr "Nie znaleziono danych"
#: js/messages.php:181
msgid "Log analysed, but no data found in this time span."
@@ -1582,16 +1580,14 @@ msgid "Chart"
msgstr "Wykres"
#: js/messages.php:191
-#, fuzzy
#| msgid "Add chart"
msgid "Edit chart"
-msgstr "Dodaj wykres"
+msgstr "Edytuj wykres"
#: js/messages.php:192
-#, fuzzy
#| msgid "Series:"
msgid "Series"
-msgstr "Serie:"
+msgstr "Serie"
#. l10n: A collection of available filters
#: js/messages.php:195
@@ -2342,53 +2338,55 @@ msgstr "Sekunda"
#: libraries/Advisor.class.php:67
#, php-format
msgid "PHP threw following error: %s"
-msgstr ""
+msgstr "PHP wyrzucił następujący błąd: %s"
#: libraries/Advisor.class.php:89
#, php-format
msgid "Failed evaluating precondition for rule '%s'"
-msgstr ""
+msgstr "Nie powiodła się ocena warunku dla reguły '%s'"
#: libraries/Advisor.class.php:106
#, php-format
msgid "Failed calculating value for rule '%s'"
-msgstr ""
+msgstr "Nie powiodło się obliczanie wartości dla reguły '%s'"
#: libraries/Advisor.class.php:125
#, php-format
msgid "Failed running test for rule '%s'"
-msgstr ""
+msgstr "Nie powiódł się uruchomiony test dla reguły '%s'"
#: libraries/Advisor.class.php:207
-#, fuzzy, php-format
+#, php-format
#| msgid ""
#| "Failed formatting string for rule '%s'. PHP threw following error: %s"
msgid "Failed formatting string for rule '%s'."
-msgstr ""
-"Nie udało się formatowanie ciągu dla reguły '%s'. PHP odkrył następujący "
-"błąd: %s"
+msgstr "Nie udało się formatowanie ciągu dla reguły '%s'."
#: libraries/Advisor.class.php:361
#, php-format
msgid ""
"Invalid rule declaration on line %1$s, expected line %2$s of previous rule"
msgstr ""
+"Nieprawidłowa deklaracja reguły w linii %1$s, oczekiwana linia %2$s z "
+"poprzedniej reguły"
#: libraries/Advisor.class.php:378
-#, fuzzy, php-format
+#, php-format
#| msgid "Invalid format of CSV input on line %d."
msgid "Invalid rule declaration on line %s"
-msgstr "Niewłaściwy format w linii %d danych wejściowych CSV."
+msgstr "Nieprawidłowa deklaracja reguły w linii %s"
#: libraries/Advisor.class.php:386
#, php-format
msgid "Unexpected characters on line %s"
-msgstr ""
+msgstr "Nieoczekiwane znaki w linii %s"
#: libraries/Advisor.class.php:400
#, php-format
msgid "Unexpected character on line %1$s. Expected tab, but found \"%2$s\""
msgstr ""
+"Nieoczekiwane znaki w linii %1$s. Spodziewana zakładka, ale nie znaleziono \""
+"%2$s\""
#: libraries/Advisor.class.php:425 server_status.php:956
msgid "per second"
@@ -2714,16 +2712,16 @@ msgid "unknown table status: "
msgstr "nieznany status tabeli: "
#: libraries/Table.class.php:750
-#, fuzzy, php-format
+#, php-format
#| msgid "Source database"
msgid "Source database `%s` was not found!"
-msgstr "Źródło bazy danych"
+msgstr "Źródło bazy danych '%s' nie zostało znalezione!"
#: libraries/Table.class.php:756
-#, fuzzy, php-format
+#, php-format
#| msgid "Theme %s not found!"
msgid "Target database `%s` was not found!"
-msgstr "Motywu %s nie znaleziono!"
+msgstr "Docelowej bazy '%s' nie znaleziono!"
#: libraries/Table.class.php:1174
msgid "Invalid database"
@@ -2803,290 +2801,354 @@ msgstr "Motyw"
msgid ""
"A 1-byte integer, signed range is -128 to 127, unsigned range is 0 to 255"
msgstr ""
+"1-Bajtowa liczba całkowita, podpisany zakres jest-128 do 127, niepodpisany "
+"zakres wynosi od 0 do 255"
#: libraries/Types.class.php:291
msgid ""
"A 2-byte integer, signed range is -32,768 to 32,767, unsigned range is 0 to "
"65,535"
msgstr ""
+"2-Bajtowa liczba całkowita, podpisany zakres jest-32,768 do 32 767, "
+"niepodpisany zakres wynosi od 0 do 65 535"
#: libraries/Types.class.php:293
msgid ""
"A 3-byte integer, signed range is -8,388,608 to 8,388,607, unsigned range is "
"0 to 16,777,215"
msgstr ""
+"3-Bajtowa liczba całkowita, podpisany zakres jest-8,388,608 do 8,388,607, "
+"jest niepodpisany zakres 0 do 16,777,215"
#: libraries/Types.class.php:295
msgid ""
"A 4-byte integer, signed range is -2,147,483,648 to 2,147,483,647, unsigned "
"range is 0 to 4,294,967,295."
msgstr ""
+"4-Bajtowa liczba całkowita, podpisany zakres jest-2,147,483,648 do 2 147 483 "
+"647, jest niepodpisany zakres 4 294 967 0 do 295."
#: libraries/Types.class.php:297
msgid ""
"An 8-byte integer, signed range is -9,223,372,036,854,775,808 to "
"9,223,372,036,854,775,807, unsigned range is 0 to 18,446,744,073,709,551,615"
msgstr ""
+"8-Bajtowa liczba całkowita, podpisany zakres jest-9,223,372,036,854,775,808 "
+"do 9,223,372,036,854,775,807, jest niepodpisany zakres 0 do "
+"18,446,744,073,709,551,615"
#: libraries/Types.class.php:299 libraries/Types.class.php:707
msgid ""
"A fixed-point number (M, D) - the maximum number of digits (M) is 65 "
"(default 10), the maximum number of decimals (D) is 30 (default 0)"
msgstr ""
+"Szereg stałoprzecinkowych (M, D) - Maksymalna liczba cyfr (M) wynosi 65 "
+"(domyślnie 10), maksymalna liczba miejsc po przecinku (D) wynosi 30 "
+"(domyślnie 0)"
#: libraries/Types.class.php:301
msgid ""
"A small floating-point number, allowable values are -3.402823466E+38 to "
"-1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38"
msgstr ""
+"Małe wartości zmiennoprzecinkowych numer, dopuszczalne są - 3.402823466E 38 "
+"do - 1.175494351E-38, 0 i 1.175494351E-38 do 3.402823466E 38"
#: libraries/Types.class.php:303
msgid ""
"A double-precision floating-point number, allowable values are "
"-1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and "
"2.2250738585072014E-308 to 1.7976931348623157E+308"
msgstr ""
+"Podwójnej precyzji numer, dopuszczalne wartości zmiennoprzecinkowych są - "
+"1.7976931348623157E 308 do - 2.2250738585072014E-308, 0 i "
+"2.2250738585072014E-308 do 1.7976931348623157E 308"
#: libraries/Types.class.php:305
msgid ""
"Synonym for DOUBLE (exception: in REAL_AS_FLOAT SQL mode it is a synonym for "
"FLOAT)"
msgstr ""
+"Synonim dla DOUBLE (wyjątek: w trybie REAL_AS_FLOAT SQL jest synonimem typu "
+"\"float\")"
#: libraries/Types.class.php:307
msgid ""
"A bit-field type (M), storing M of bits per value (default is 1, maximum is "
"64)"
msgstr ""
+"Przechowywanie m bitów na wartość typu pole bitowe (M), (wartością domyślną "
+"jest 1, maksymalnie jest 64)"
#: libraries/Types.class.php:309
msgid ""
"A synonym for TINYINT(1), a value of zero is considered false, nonzero "
"values are considered true"
msgstr ""
+"Synonim TINYINT(1), wartość zero uznaje wartość FAŁSZ, wartości niezerowe — "
+"są uważane za prawdziwe"
#: libraries/Types.class.php:311
msgid "An alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE"
-msgstr ""
+msgstr "Alias unikatowy BIGINT niepodpisane nie NULL AUTO_INCREMENT"
#: libraries/Types.class.php:313 libraries/Types.class.php:717
-#, fuzzy, php-format
+#, php-format
#| msgid "authored on %1$s by %2$s"
msgid "A date, supported range is %1$s to %2$s"
-msgstr "autorem %1$s dla %2$s"
+msgstr "Datę, obsługiwany jest zakres %1$s do %2$s"
#: libraries/Types.class.php:315 libraries/Types.class.php:719
#, php-format
msgid "A date and time combination, supported range is %1$s to %2$s"
-msgstr ""
+msgstr "Data i godzina kombinacja zakresu obsługiwanych jest %1$ s %2$ s"
#: libraries/Types.class.php:317
msgid ""
"A timestamp, range is 1970-01-01 00:00:01 UTC to 2038-01-09 03:14:07 UTC, "
"stored as the number of seconds since the epoch (1970-01-01 00:00:00 UTC)"
msgstr ""
+"Sygnatura czasowa, zakres jest 1970-01-01 00: 00: 01 UTC do roku 2038-01-09 "
+"03: 14: 07 UTC, przechowywane jako liczba sekund od epoki (1970-01-01 00: "
+"00: 00 UTC)"
#: libraries/Types.class.php:319 libraries/Types.class.php:723
-#, fuzzy, php-format
+#, php-format
#| msgid "Error renaming table %1$s to %2$s"
msgid "A time, range is %1$s to %2$s"
-msgstr "Błąd podczas zmiany nazwy tabeli z %1$s na %2$s"
+msgstr "Czas, zakres jest %1$s do %2$s"
#: libraries/Types.class.php:321
msgid ""
"A year in four-digit (4, default) or two-digit (2) format, the allowable "
"values are 70 (1970) to 69 (2069) or 1901 to 2155 and 0000"
msgstr ""
+"W roku w czterocyfrowym (4, domyślnie) lub (2) formacie dwucyfrowym, "
+"wartości dopuszczalne są 70 (1970)-69 (2069) lub 1901 do 2155 i 0000"
#: libraries/Types.class.php:323
msgid ""
"A fixed-length (0-255, default 1) string that is always right-padded with "
"spaces to the specified length when stored"
msgstr ""
+"O stałej długości (0-255, domyślnie 1) ciąg znaków, który jest zawsze prawo "
+"dopełnione spacjami do podanej długości podczas przechowywania"
#: libraries/Types.class.php:325 libraries/Types.class.php:725
#, php-format
msgid ""
"A variable-length (%s) string, the effective maximum length is subject to "
"the maximum row size"
msgstr ""
+"Ciąg znaków o zmiennej długości (% s) efektywna długość maksymalna jest z "
+"zastrzeżeniem maksymalny rozmiar wiersza"
#: libraries/Types.class.php:327
msgid ""
"A TEXT column with a maximum length of 255 (2^8 - 1) characters, stored with "
"a one-byte prefix indicating the length of the value in bytes"
msgstr ""
+"Kolumna tekstu o maksymalnej długości 255 (2 ^ 8 - 1) znaków przechowywanych "
+"z prefiksem jednobajtowych wskazujące długość wartości w bajtach"
#: libraries/Types.class.php:329 libraries/Types.class.php:727
msgid ""
"A TEXT column with a maximum length of 65,535 (2^16 - 1) characters, stored "
"with a two-byte prefix indicating the length of the value in bytes"
msgstr ""
+"Kolumna tekstu o maksymalnej długości 65 535 (2 ^ 16 - 1) znaki, "
+"przechowywane prefiksu dwubajtowy, wskazując długość wartości w bajtach"
#: libraries/Types.class.php:331
msgid ""
"A TEXT column with a maximum length of 16,777,215 (2^24 - 1) characters, "
"stored with a three-byte prefix indicating the length of the value in bytes"
msgstr ""
+"Kolumna tekstu o maksymalnej długości 16,777,215 (2 ^ 24 - 1) znaków "
+"przechowywanych z prefiksem trzybajtowy wskazujące długość wartości w "
+"bajtach"
#: libraries/Types.class.php:333
msgid ""
"A TEXT column with a maximum length of 4,294,967,295 or 4GiB (2^32 - 1) "
"characters, stored with a four-byte prefix indicating the length of the "
"value in bytes"
msgstr ""
+"Kolumna tekstu o maksymalnej długooci 4 294 967 295 lub 4GiB (2 ^ 32 - 1) "
+"znaki, przechowywane prefiksu czwartego bajtu, wskazując długość wartości w "
+"bajtach"
#: libraries/Types.class.php:335
msgid ""
"Similar to the CHAR type, but stores binary byte strings rather than non-"
"binary character strings"
msgstr ""
+"Podobne do typu CHAR, ale przechowuje binarna bajtu ciągi zamiast ciągów "
+"znaków nieznakowe"
#: libraries/Types.class.php:337
msgid ""
"Similar to the VARCHAR type, but stores binary byte strings rather than non-"
"binary character strings"
msgstr ""
+"Podobnego typu VARCHAR, ale przechowuje binarna bajtu ciągów, zamiast ciągów "
+"znaków nieznakowe"
#: libraries/Types.class.php:339
msgid ""
"A BLOB column with a maximum length of 255 (2^8 - 1) bytes, stored with a "
"one-byte prefix indicating the length of the value"
msgstr ""
+"Kolumna BLOB o maksymalnej długości 255 (2 ^ 8 - 1) bajtów, przechowywane z "
+"prefiksem jednobajtowych wskazujące długość wartości"
#: libraries/Types.class.php:341
msgid ""
"A BLOB column with a maximum length of 16,777,215 (2^24 - 1) bytes, stored "
"with a three-byte prefix indicating the length of the value"
msgstr ""
+"Kolumna BLOB o maksymalnej długości 16,777,215 (2 ^ 24 - 1) bajtów, "
+"przechowywane z prefiksem trzybajtowy wskazujące długość wartości"
#: libraries/Types.class.php:343
msgid ""
"A BLOB column with a maximum length of 65,535 (2^16 - 1) bytes, stored with "
"a two-byte prefix indicating the length of the value"
msgstr ""
+"Kolumna BLOB o maksymalnej długości 65 535 (2 ^ 16 - 1) bajtów, "
+"przechowywane prefiksu dwubajtowy, wskazując długość wartości"
#: libraries/Types.class.php:345
msgid ""
"A BLOB column with a maximum length of 4,294,967,295 or 4GiB (2^32 - 1) "
"bytes, stored with a four-byte prefix indicating the length of the value"
msgstr ""
+"Kolumny obiektu BLOB o maksymalnej długooci 4 294 967 295 lub 4GiB (2 ^ 32 - "
+"1) bajtów, przechowywane prefiksu czwartego bajtu, wskazując długość "
+"wartości"
#: libraries/Types.class.php:347
msgid ""
"An enumeration, chosen from the list of up to 65,535 values or the special "
"'' error value"
msgstr ""
+"Wyliczenie, wybrane z listy wartości maksymalnie 65 535 lub specjalnych '' "
+"wartość błędu"
#: libraries/Types.class.php:349
msgid "A single value chosen from a set of up to 64 members"
-msgstr ""
+msgstr "Pojedyncza wartość wybrana z zestawu maksymalnie 64 członków"
#: libraries/Types.class.php:351
msgid "A type that can store a geometry of any type"
-msgstr ""
+msgstr "Typy, które mogą przechowywać geometrię dowolnego typu"
#: libraries/Types.class.php:353
msgid "A point in 2-dimensional space"
-msgstr ""
+msgstr "Punkt w przestrzeni 2-wymiarowej"
#: libraries/Types.class.php:355
msgid "A curve with linear interpolation between points"
-msgstr ""
+msgstr "Krzywa z interpolacji liniowej pomiędzy punktami"
#: libraries/Types.class.php:357
-#, fuzzy
#| msgid "Add a polygon"
msgid "A polygon"
-msgstr "Dodaj wielokąt"
+msgstr "Wielokąt"
#: libraries/Types.class.php:359
msgid "A collection of points"
-msgstr ""
+msgstr "Zbiór punktów"
#: libraries/Types.class.php:361
msgid "A collection of curves with linear interpolation between points"
-msgstr ""
+msgstr "Zbiór krzywych z interpolacji liniowej pomiędzy punktami"
#: libraries/Types.class.php:363
msgid "A collection of polygons"
-msgstr ""
+msgstr "Zbiór wielokątów"
#: libraries/Types.class.php:365
msgid "A collection of geometry objects of any type"
-msgstr ""
+msgstr "Zbiór obiektów geometrycznych dowolnego typu"
#: libraries/Types.class.php:619 libraries/Types.class.php:971
msgctxt "numeric types"
msgid "Numeric"
-msgstr ""
+msgstr "Numeryczny"
#: libraries/Types.class.php:638 libraries/Types.class.php:974
msgctxt "date and time types"
msgid "Date and time"
-msgstr ""
+msgstr "Data i czas"
#: libraries/Types.class.php:647 libraries/Types.class.php:977
-#, fuzzy
#| msgid "Linestring"
msgctxt "string types"
msgid "String"
-msgstr "Linia ciągu"
+msgstr "Ciąg"
#: libraries/Types.class.php:668
-#, fuzzy
#| msgid "Spatial"
msgctxt "spatial types"
msgid "Spatial"
msgstr "Przestrzenny"
#: libraries/Types.class.php:703
msgid "A 4-byte integer, range is -2,147,483,648 to 2,147,483,647"
-msgstr ""
+msgstr "4-Bajtowa liczba całkowita, zakres jest-2,147,483,648 do 2 147 483 647"
#: libraries/Types.class.php:705
msgid ""
"An 8-byte integer, range is -9,223,372,036,854,775,808 to "
"9,223,372,036,854,775,807"
msgstr ""
+"8-Bajtowa liczba całkowita, zakres jest-9,223,372,036,854,775,808 do "
+"9,223,372,036,854,775,807"
#: libraries/Types.class.php:709
msgid "A system's default double-precision floating-point number"
-msgstr ""
+msgstr "Liczba zmiennoprzecinkowa podwójnej precyzji domyślnego systemu"
#: libraries/Types.class.php:711
msgid "True or false"
-msgstr ""
+msgstr "Prawda lub fałsz"
#: libraries/Types.class.php:713
msgid "An alias for BIGINT NOT NULL AUTO_INCREMENT UNIQUE"
-msgstr ""
+msgstr "Alias unikatowy dla BIGINT NOT NULL AUTO_INCREMENT"
#: libraries/Types.class.php:715
msgid "Stores a Universally Unique Identifier (UUID)"
-msgstr ""
+msgstr "Przechowuje unikatowego identyfikatora (UUID)"
#: libraries/Types.class.php:721
msgid ""
"A timestamp, range is '0001-01-01 00:00:00' UTC to '9999-12-31 23:59:59' "
"UTC; TIMESTAMP(6) can store microseconds"
msgstr ""
+"Sygnatury czasowej, zakres jest ' 0001-01-01 00: 00: 00' UTC do \"9999-12-31 "
+"23: 59: 59' UTC; TimeStamp(6) mogą być przechowywane w mikrosekundach"
#: libraries/Types.class.php:729
msgid ""
"A variable-length (0-65,535) string, uses binary collation for all "
"comparisons"
msgstr ""
+"Ciąg o długości zmiennej (0 do 65 535) używa binarne sortowania dla "
+"wszystkich porównań"
#: libraries/Types.class.php:731
msgid ""
"A BLOB column with a maximum length of 65,535 (2^16 - 1) bytes, stored with "
"a four-byte prefix indicating the length of the value"
msgstr ""
+"Kolumna BLOB o maksymalnej długości 65 535 (2 ^ 16 - 1) bajtów, "
+"przechowywane prefiksu czwartego bajtu, wskazując długość wartości"
#: libraries/Types.class.php:733
msgid "An enumeration, chosen from the list of defined values"
-msgstr ""
+msgstr "Wyliczenie, wybrane z listy zdefiniowane wartości"
#: libraries/auth/config.auth.lib.php:72
msgid "Cannot connect: invalid settings."
@@ -7271,10 +7333,10 @@ msgid "This plugin does not support compressed imports!"
msgstr "Ten moduł nie obsługuje skompresowanych importów!"
#: libraries/import/mediawiki.php:246
-#, fuzzy, php-format
+#, php-format
#| msgid "Invalid format of CSV input on line %d."
msgid "Invalid format of mediawiki input on line: <br />%s."
-msgstr "Niewłaściwy format w linii %d danych wejściowych CSV."
+msgstr "Nieprawidłowy format danych wejściowych mediawiki w wierszu: <br/>%s."
#: libraries/import/ods.php:49
msgid "Import percentages as proper decimals <i>(ex. 12.00% to .12)</i>"
@@ -7301,7 +7363,7 @@ msgstr "Plik kształtu ESRI"
#: libraries/import/shp.php:199
#, php-format
msgid "Geometry type '%s' is not supported by MySQL."
-msgstr ""
+msgstr "Geometria typ '% s' nie jest obsługiwany przez MySQL."
#: libraries/import/shp.php:360
#, php-format
@@ -8528,10 +8590,9 @@ msgid "Index"
msgstr "Indeks"
#: libraries/tbl_properties.inc.php:120
-#, fuzzy
#| msgid "Remove column(s)"
msgid "Move column"
-msgstr "Usuń kolumnę(y)"
+msgstr "Przenieść kolumnę"
#: libraries/tbl_properties.inc.php:129
#, php-format
@@ -8587,13 +8648,13 @@ msgstr "Pełny tekst"
#: libraries/tbl_properties.inc.php:570
msgid "first"
-msgstr ""
+msgstr "pierwszy"
#: libraries/tbl_properties.inc.php:579
-#, fuzzy, php-format
+#, php-format
#| msgid "After %s"
msgid "after %s"
-msgstr "Po %s"
+msgstr "po %s"
#: libraries/tbl_properties.inc.php:691 tbl_structure.php:697
#, php-format
@@ -11643,10 +11704,9 @@ msgid "Table %1$s has been altered successfully"
msgstr "Tabela %1$s została pomyślnie zmodyfikowana"
#: tbl_alter.php:131
-#, fuzzy
#| msgid "The selected users have been deleted successfully."
msgid "The columns have been moved successfully."
-msgstr "Wybrani użytkownicy zostali usunięci pomyślnie."
+msgstr "Kolumny przeniesiono pomyślnie."
#: tbl_change.php:745
msgid "Because of its length,<br /> this column might not be editable"
@@ -12095,14 +12155,13 @@ msgid "Show more actions"
msgstr "Pokaż więcej akcji"
#: tbl_structure.php:621 tbl_structure.php:686
-#, fuzzy
#| msgid "Remove column(s)"
msgid "Move columns"
-msgstr "Usuń kolumnę(y)"
+msgstr "Przenieś kolumny"
#: tbl_structure.php:622
msgid "Move the columns by dragging them up and down."
-msgstr ""
+msgstr "Aby przenieś kolumny, przeciągając je w górę i w dół."
#: tbl_structure.php:648
msgid "Edit view"
@@ -12724,6 +12783,15 @@ msgid ""
"using this formula: (query_cache_size - qcache_free_memory) / "
"qcache_queries_in_cache"
msgstr ""
+"Poważne rozdrobnienia jest prawdopodobnie (dalszego) zwiększenie "
+"Qcache_lowmem_prunes. Może to być spowodowane przez wiele kwerendy pamięci "
+"podręcznej mało pamięci śliwek spowodowane {query_cache_size} jest zbyt "
+"mały. Natychmiastowe, ale krótki mieszkał poprawki można opróżnić pamięci "
+"podręcznej kwerendy (może zablokować Zapytanie cache przez długi czas). "
+"Starannie dostosowując {query_cache_min_res_unit} do niższej wartości może "
+"pomóc w zbyt, np można ustawić Średni rozmiar kwerendy w pamięci podręcznej, "
+"za pomocą następującej formuły: (query_cache_size - qcache_free_memory) / "
+"qcache_queries_in_cache"
#: libraries/advisory_rules.txt:179
#, php-format
View
10 po/pt.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-05-09 13:14+0200\n"
-"PO-Revision-Date: 2012-05-11 14:59+0200\n"
+"PO-Revision-Date: 2012-05-14 13:56+0200\n"
"Last-Translator: Vítor Martins <vjmartins@sapo.pt>\n"
"Language-Team: portuguese <pt@li.org>\n"
"Language: pt\n"
@@ -1487,7 +1487,7 @@ msgid "Differential"
msgstr "Diferencial"
#: js/messages.php:167
-#, fuzzy, php-format
+#, php-format
#| msgid "Divided by %s:"
msgid "Divided by %s"
msgstr "Dividido por %s:"
@@ -2352,7 +2352,7 @@ msgstr "Sem"
#. l10n: Month-year order for calendar, use either "calendar-month-year" or "calendar-year-month".
#: js/messages.php:510
msgid "calendar-month-year"
-msgstr ""
+msgstr "Calendário-mês-ano"
#. l10n: Year suffix for calendar, "none" is empty.
#: js/messages.php:512
@@ -2438,7 +2438,7 @@ msgstr "por hora"
#: libraries/Advisor.class.php:434
msgid "per day"
-msgstr ""
+msgstr "por dia"
#: libraries/Config.class.php:915
#, php-format
@@ -2457,7 +2457,7 @@ msgstr "Tamanho da fonte"
#: libraries/Error_Handler.class.php:62
msgid "Too many error messages, some are not displayed."
-msgstr ""
+msgstr "Excesso de mensagens de erro, algumas não serão mostradas."
#: libraries/File.class.php:234
msgid "File was not an uploaded file."
View
34 po/ro.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-05-09 13:14+0200\n"
-"PO-Revision-Date: 2012-04-24 14:18+0200\n"
+"PO-Revision-Date: 2012-05-15 00:52+0200\n"
"Last-Translator: Alex Marin <alex.ukf@gmail.com>\n"
"Language-Team: romanian <ro@li.org>\n"
"Language: ro\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
"20)) ? 1 : 2);;\n"
-"X-Generator: Weblate 0.10\n"
+"X-Generator: Weblate 1.0\n"
#: browse_foreigners.php:35 browse_foreigners.php:59 js/messages.php:358
#: libraries/display_tbl.lib.php:399 server_privileges.php:1828
@@ -10291,51 +10291,54 @@ msgstr "Vizualizarea %s a fost eliminată"
#: server_replication.php:79
msgid "Unknown error"
-msgstr ""
+msgstr "Eroare necunoscută"
#: server_replication.php:86
#, php-format
msgid "Unable to connect to master %s."
-msgstr ""
+msgstr "Nu s-a putut realiza conexiunea la master %s."
#: server_replication.php:93
msgid ""
"Unable to read master log position. Possible privilege problem on master."
msgstr ""
+"Nu s-a putut citi poziția jurnalului master. Posibilă eroare de permisiuni "
+"pe master."
#: server_replication.php:99
msgid "Unable to change master"
-msgstr ""
+msgstr "Nu s-a putut schimba master-ul"
#: server_replication.php:102
-#, fuzzy, php-format
+#, php-format
#| msgid "The privileges were reloaded successfully."
msgid "Master server changed successfully to %s"
-msgstr "Drepturile au fost reîncarcate cu succes."
+msgstr "Server master schimbat cu succes în %s"
#: server_replication.php:207
msgid "This server is configured as master in a replication process."
-msgstr ""
+msgstr "Acest server este configurat ca master într-un proces de replicare."
#: server_replication.php:209 server_status.php:635
-#, fuzzy
msgid "Show master status"
-msgstr "Afișează stare sclav"
+msgstr "Afișați status master"
#: server_replication.php:213
msgid "Show connected slaves"
-msgstr ""
+msgstr "Afișați sclavi conectați"
#: server_replication.php:237
#, php-format
msgid ""
"This server is not configured as master in a replication process. Would you "
"like to <a href=\"%s\">configure</a> it?"
msgstr ""
+"Acest server nu este configurat ca master într-un proces de replicare. "
+"Doriți să îl <a href=\"%s\">configurați</a>? "
#: server_replication.php:244
msgid "Master configuration"
-msgstr ""
+msgstr "Configurare master"
#: server_replication.php:245
msgid ""
@@ -10345,6 +10348,11 @@ msgid ""
"ignore all databases by default and allow only certain databases to be "
"replicated. Please select the mode:"
msgstr ""
+"Acest server nu este configurat ca master într-un proces de duplicare. "
+"Puteți alege dintre fie a duplica toate bazele de date și a ignora doar "
+"unele (util în cazul în care doriți să duplicați majoritatea bazelor de "
+"date), fie a ignora toate bazele de date implicit și a permite doar "
+"anumitora să fie duplicate. Va rugăm sa selectați modul:"
#: server_replication.php:248
msgid "Replicate all databases; Ignore:"
@@ -10757,6 +10765,8 @@ msgid ""
"The number of in-memory temporary tables created automatically by the server "
"while executing statements."
msgstr ""
+"Numărul de tabele temporare create automat în memorie de căter server în "
+"timpul execuției de interogări."
#: server_status.php:1325
msgid ""
View
157 test/classes/PMA_Message_test.php
@@ -46,7 +46,7 @@ protected function tearDown()
/**
* to String casting test
*/
- public function test__toString()
+ public function testToString()
{
$this->object->setMessage('test<&>', true);
$this->assertEquals('test&lt;&amp;&gt;', (string)$this->object);
@@ -59,7 +59,10 @@ public function testSuccess()
{
$this->object = new PMA_Message('test<&>', PMA_Message::SUCCESS);
$this->assertEquals($this->object, PMA_Message::success('test<&>'));
- $this->assertEquals('Your SQL query has been executed successfully', PMA_Message::success()->getString());
+ $this->assertEquals(
+ 'Your SQL query has been executed successfully',
+ PMA_Message::success()->getString()
+ );
}
/**
@@ -171,11 +174,20 @@ public function testSetString()
public function testAddParam()
{
$this->object->addParam(PMA_Message::notice('test'));
- $this->assertEquals(array(PMA_Message::notice('test')), $this->object->getParams());
+ $this->assertEquals(
+ array(PMA_Message::notice('test')),
+ $this->object->getParams()
+ );
$this->object->addParam('test', true);
- $this->assertEquals(array(PMA_Message::notice('test'), 'test'), $this->object->getParams());
+ $this->assertEquals(
+ array(PMA_Message::notice('test'), 'test'),
+ $this->object->getParams()
+ );
$this->object->addParam('test', false);
- $this->assertEquals(array(PMA_Message::notice('test'), 'test', PMA_Message::notice('test')), $this->object->getParams());
+ $this->assertEquals(
+ array(PMA_Message::notice('test'), 'test', PMA_Message::notice('test')),
+ $this->object->getParams()
+ );
}
/**
@@ -184,9 +196,20 @@ public function testAddParam()
public function testAddString()
{
$this->object->addString('test', '*');
- $this->assertEquals(array('*', PMA_Message::notice('test')), $this->object->getAddedMessages());
+ $this->assertEquals(
+ array('*', PMA_Message::notice('test')),
+ $this->object->getAddedMessages()
+ );
$this->object->addString('test', '');
- $this->assertEquals(array('*', PMA_Message::notice('test'), '', PMA_Message::notice('test')), $this->object->getAddedMessages());
+ $this->assertEquals(
+ array(
+ '*',
+ PMA_Message::notice('test'),
+ '',
+ PMA_Message::notice('test')
+ ),
+ $this->object->getAddedMessages()
+ );
}
/**
@@ -195,9 +218,19 @@ public function testAddString()
public function testAddMessage()
{
$this->object->addMessage('test', '');
- $this->assertEquals(array(PMA_Message::rawNotice('test')), $this->object->getAddedMessages());
+ $this->assertEquals(
+ array(PMA_Message::rawNotice('test')),
+ $this->object->getAddedMessages()
+ );
$this->object->addMessage('test');
- $this->assertEquals(array(PMA_Message::rawNotice('test'), ' ', PMA_Message::rawNotice('test')), $this->object->getAddedMessages());
+ $this->assertEquals(
+ array(
+ PMA_Message::rawNotice('test'),
+ ' ',
+ PMA_Message::rawNotice('test')
+ ),
+ $this->object->getAddedMessages()
+ );
}
/**
@@ -211,7 +244,14 @@ public function testAddMessages()
$messages[] = "Test3";
$this->object->addMessages($messages, '');
- $this->assertEquals(array(PMA_Message::rawNotice('Test1'), PMA_Message::error("PMA_Test2"), PMA_Message::rawNotice('Test3')), $this->object->getAddedMessages());
+ $this->assertEquals(
+ array(
+ PMA_Message::rawNotice('Test1'),
+ PMA_Message::error("PMA_Test2"),
+ PMA_Message::rawNotice('Test3')
+ ),
+ $this->object->getAddedMessages()
+ );
}
/**
@@ -231,8 +271,14 @@ public function testSetParams()
public function testSanitize()
{
$this->object->setString('test&string<>', false);
- $this->assertEquals('test&amp;string&lt;&gt;', PMA_Message::sanitize($this->object));
- $this->assertEquals(array('test&amp;string&lt;&gt;', 'test&amp;string&lt;&gt;'), PMA_Message::sanitize(array($this->object, $this->object)));
+ $this->assertEquals(
+ 'test&amp;string&lt;&gt;',
+ PMA_Message::sanitize($this->object)
+ );
+ $this->assertEquals(
+ array('test&amp;string&lt;&gt;', 'test&amp;string&lt;&gt;'),
+ PMA_Message::sanitize(array($this->object, $this->object))
+ );
}
public function decodeBBDataProvider()
@@ -271,13 +317,18 @@ public function decodeBBDataProvider()
/**
* testing decodeBB method
+ *
+ * @param string $actual BB code string
+ * @param string $expected Expected decoded string
+ *
* @dataProvider decodeBBDataProvider
*/
public function testDecodeBB($actual, $expected)
{
$GLOBALS['lang'] = 'en';
$_SESSION[' PMA_token '] = 'token';
+ unset($GLOBALS['server']);
$this->assertEquals($expected, PMA_Message::decodeBB($actual));
}
@@ -286,10 +337,22 @@ public function testDecodeBB($actual, $expected)
*/
public function testFormat()
{
- $this->assertEquals('test string', PMA_Message::format('test string'));
- $this->assertEquals('test string', PMA_Message::format('test string', 'a'));
- $this->assertEquals('test string', PMA_Message::format('test string', array()));
- $this->assertEquals('test string', PMA_Message::format('%s string', array('test')));
+ $this->assertEquals(
+ 'test string',
+ PMA_Message::format('test string')
+ );
+ $this->assertEquals(
+ 'test string',
+ PMA_Message::format('test string', 'a')
+ );
+ $this->assertEquals(
+ 'test string',
+ PMA_Message::format('test string', array())
+ );
+ $this->assertEquals(
+ 'test string',
+ PMA_Message::format('%s string', array('test'))
+ );
}
@@ -300,20 +363,26 @@ public function testGetHash()
{
$this->object->setString('<&>test', false);
$this->object->setMessage('<&>test', false);
- $this->assertEquals(md5(PMA_Message::NOTICE . '<&>test<&>test'), $this->object->getHash());
+ $this->assertEquals(
+ md5(PMA_Message::NOTICE . '<&>test<&>test'),
+ $this->object->getHash()
+ );
}
/**
- * getMessage test - with empty message and with non-empty string - not key in globals
- * additional params are defined
+ * getMessage test - with empty message and with non-empty string -
+ * not key in globals additional params are defined
*/
public function testGetMessageWithoutMessageWithStringWithParams()
{
$this->object->setMessage('');
$this->object->setString('test string %s %s');
$this->object->addParam('test param 1');
$this->object->addParam('test param 2');
- $this->assertEquals('test string test param 1 test param 2', $this->object->getMessage());
+ $this->assertEquals(
+ 'test string test param 1 test param 2',
+ $this->object->getMessage()
+ );
}
/**
@@ -337,7 +406,10 @@ public function testGetMessageWithoutMessageWithGlobalStringWithAddMessages()
$this->object->setString('key');
$this->object->addMessage('test message 2', ' - ');
$this->object->addMessage('test message 3', '&');
- $this->assertEquals('test message - test message 2&test message 3', $this->object->getMessage());
+ $this->assertEquals(
+ 'test message - test message 2&test message 3',
+ $this->object->getMessage()
+ );
unset($GLOBALS['key']);
}
@@ -348,7 +420,10 @@ public function testGetMessageWithoutMessageWithGlobalStringWithAddMessages()
public function testGetMessageWithMessageWithBBCode()
{
$this->object->setMessage('[kbd]test[/kbd] [a@./Documentation.html#cfg_Example@_blank]test[/a]');
- $this->assertEquals('<kbd>test</kbd> <a href="./Documentation.html#cfg_Example" target="_blank">test</a>', $this->object->getMessage());
+ $this->assertEquals(
+ '<kbd>test</kbd> <a href="./Documentation.html#cfg_Example" target="_blank">test</a>',
+ $this->object->getMessage()
+ );
}
/**
@@ -383,7 +458,10 @@ public function testDisplay()
public function testGetDisplay()
{
$this->object->setMessage('Test Message');
- $this->assertEquals('<div class="notice">Test Message</div>', $this->object->getDisplay());
+ $this->assertEquals(
+ '<div class="notice">Test Message</div>',
+ $this->object->getDisplay()
+ );
}
/**
@@ -398,14 +476,19 @@ public function testIsDisplayed()
public function providerAffectedRows()
{
- return array(array(1, '<div class="notice"> 1 row affected.</div>'));
- return array(array(2, '<div class="notice"> 2 rows affected.</div>'));
- return array(array(50000000000000, '<div class="notice"> 50000000000000 rows affected.</div>'));
+ return array(
+ array(1, '<div class="notice"> 1 row affected.</div>'),
+ array(2, '<div class="notice"> 2 rows affected.</div>'),
+ array(50000000000000, '<div class="notice"> 50000000000000 rows affected.</div>'),
+ );
}
/**
* affected_rows test
*
+ * @param int $rows Number of rows
+ * @param string $output Expected string
+ *
* @dataProvider providerAffectedRows
*/
public function testAffectedRows($rows, $output)
@@ -419,14 +502,19 @@ public function testAffectedRows($rows, $output)
public function providerInsertedRows()
{
- return array(array(1, '<div class="notice"> 1 row inserted.</div>'));
- return array(array(2, '<div class="notice"> 2 rows inserted.</div>'));
- return array(array(50000000000000, '<div class="notice"> 50000000000000 rows inserted.</div>'));
+ return array(
+ array(1, '<div class="notice"> 1 row inserted.</div>'),
+ array(2, '<div class="notice"> 2 rows inserted.</div>'),
+ array(50000000000000, '<div class="notice"> 50000000000000 rows inserted.</div>'),
+ );
}
/**
* inserted_rows test
*
+ * @param int $rows Number of rows
+ * @param string $output Expected string
+ *
* @dataProvider providerInsertedRows
*/
public function testInsertedRows($rows, $output)
@@ -440,14 +528,19 @@ public function testInsertedRows($rows, $output)
public function providerDeletedRows()
{
- return array(array(1, '<div class="notice"> 1 row deleted.</div>'));
- return array(array(2, '<div class="notice"> 2 rows deleted.</div>'));
- return array(array(50000000000000, '<div class="notice"> 50000000000000 rows deleted.</div>'));
+ return array(
+ array(1, '<div class="notice"> 1 row deleted.</div>'),
+ array(2, '<div class="notice"> 2 rows deleted.</div>'),
+ array(50000000000000, '<div class="notice"> 50000000000000 rows deleted.</div>'),
+ );
}
/**
* deleted_rows test
*
+ * @param int $rows Number of rows
+ * @param string $output Expected string
+ *
* @dataProvider providerDeletedRows
*/
public function testDeletedRows($rows, $output)

0 comments on commit 27cc0c1

Please sign in to comment.