From a9b39d3b87bc517bce9c919f2cdbdb7c68b01f5b Mon Sep 17 00:00:00 2001 From: Jukka Penttinen Date: Sun, 24 Jun 2012 07:00:22 +0200 Subject: [PATCH 01/24] Translated using Weblate. --- po/fi.po | 218 ++++++++++++++++++++----------------------------------- 1 file changed, 80 insertions(+), 138 deletions(-) diff --git a/po/fi.po b/po/fi.po index a7413589de..41e79eb00a 100644 --- a/po/fi.po +++ b/po/fi.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-06-18 10:54+0200\n" -"PO-Revision-Date: 2012-05-21 20:39+0200\n" +"PO-Revision-Date: 2012-06-24 00:18+0200\n" "Last-Translator: Jukka Penttinen \n" "Language-Team: finnish \n" "Language: fi\n" @@ -1531,7 +1531,7 @@ msgstr "Siirry lokitauluun" #: js/messages.php:180 msgid "No data found" -msgstr "Tieotoa ei löytynyt" +msgstr "Tietoa ei löydy" #: js/messages.php:181 msgid "Log analysed, but no data found in this time span." @@ -1651,11 +1651,11 @@ msgstr "Tuonti" #: js/messages.php:213 msgid "Import monitor configuration" -msgstr "Tuo seurantamääritys" +msgstr "Tuo seuranta-asetukset" #: js/messages.php:214 msgid "Please select the file you want to import" -msgstr "Valitse tiedosto jonka haluat tuoda" +msgstr "Valitse tuotava tiedosto" #: js/messages.php:216 msgid "Analyse Query" @@ -1890,10 +1890,9 @@ msgid "To zoom in, select a section of the plot with the mouse." msgstr "" #: js/messages.php:306 -#, fuzzy #| msgid "Click reset zoom link to come back to original state." msgid "Click reset zoom button to come back to original state." -msgstr "Palaa alkuperäiseen tilaan napsauttamalla zoomauksen nollauslinkkiä." +msgstr "Palaa alkuperäiseen tilaan napsauttamalla nollaa zoomaus painikeeta." #: js/messages.php:308 msgid "Click a data point to view and possibly edit the data row." @@ -2395,16 +2394,14 @@ msgid "Font size" msgstr "Fonttikoko" #: libraries/DisplayResults.class.php:472 -#, fuzzy #| msgid "Save directory" msgid "Save edited data" -msgstr "Tallennushakemisto" +msgstr "Tallenna muokatut tiedot" #: libraries/DisplayResults.class.php:478 -#, fuzzy #| msgid "CHAR textarea columns" msgid "Restore column order" -msgstr "CHAR-tekstikentän sarakkeet" +msgstr "Palauta sarakkeiden järjestys" #: libraries/DisplayResults.class.php:546 libraries/common.lib.php:2556 #: libraries/common.lib.php:2560 @@ -2431,22 +2428,19 @@ msgid "End" msgstr "Viimeinen sivu" #: libraries/DisplayResults.class.php:673 -#, fuzzy #| msgid "Start" msgid "Start row" -msgstr "Käynnistä" +msgstr "Aloitusrivi" #: libraries/DisplayResults.class.php:677 -#, fuzzy #| msgid "Number of fields" msgid "Number of rows" -msgstr "Kenttien määrä" +msgstr "Rivien määrä" #: libraries/DisplayResults.class.php:686 -#, fuzzy #| msgid "More" msgid "Mode" -msgstr "Lisää" +msgstr "Tila" #: libraries/DisplayResults.class.php:688 msgid "horizontal" @@ -2461,10 +2455,10 @@ msgid "vertical" msgstr "pystysuorassa" #: libraries/DisplayResults.class.php:702 -#, fuzzy, php-format +#, php-format #| msgid "Execute bookmarked query" msgid "Headers every %s rows" -msgstr "Suorita kysely kirjanmerkeistä" +msgstr "Otsikot joka %s rivi" #: libraries/DisplayResults.class.php:1180 msgid "Sort by key" @@ -2490,14 +2484,12 @@ msgstr "Valinnat" #: libraries/DisplayResults.class.php:1329 #: libraries/DisplayResults.class.php:1435 -#, fuzzy #| msgid "Partial Texts" msgid "Partial texts" -msgstr "Lyhennetyt tekstit" +msgstr "Osittaiset tekstit" #: libraries/DisplayResults.class.php:1330 #: libraries/DisplayResults.class.php:1439 -#, fuzzy #| msgid "Full Texts" msgid "Full texts" msgstr "Koko tekstit" @@ -2526,10 +2518,9 @@ msgid "Show binary contents as HEX" msgstr "Näytä binaarisisältö heksamuodossa" #: libraries/DisplayResults.class.php:1378 -#, fuzzy #| msgid "Browser transformation" msgid "Hide browser transformation" -msgstr "Selaimen muunnos (transformation)" +msgstr "piilota webselaimen muunnos" #: libraries/DisplayResults.class.php:1387 msgid "Well Known Text" @@ -2972,19 +2963,16 @@ msgid "Value" msgstr "Arvo" #: libraries/TableSearch.class.php:205 -#, fuzzy #| msgid "Search" msgid "Table Search" -msgstr "Etsi" +msgstr "Taulu haku" #: libraries/TableSearch.class.php:234 libraries/insert_edit.lib.php:1208 -#, fuzzy #| msgid "Insert" msgid "Edit/Insert" -msgstr "Lisää rivi" +msgstr "Muokkaa/lisää" #: libraries/TableSearch.class.php:739 -#, fuzzy #| msgid "Select fields (at least one):" msgid "Select columns (at least one):" msgstr "Valitse sarakkeet (vähintään yksi):" @@ -3006,10 +2994,9 @@ msgid "Use this column to label each point" msgstr "" #: libraries/TableSearch.class.php:834 -#, fuzzy #| msgid "Maximum number of rows to display" msgid "Maximum rows to plot" -msgstr "Näytettävien rivien enimmäismäärä" +msgstr "Tulostettavien rivien enimmäismäärä" #: libraries/TableSearch.class.php:861 libraries/TableSearch.class.php:1139 #: sql.php:143 tbl_change.php:211 @@ -3017,16 +3004,15 @@ msgid "Browse foreign values" msgstr "Selaa viitearvoja" #: libraries/TableSearch.class.php:947 -#, fuzzy #| msgid "Hide search criteria" msgid "Additional search criteria" -msgstr "Piilota hakusanat" +msgstr "Tarkempi haku" #: libraries/TableSearch.class.php:1084 -#, fuzzy #| msgid "Do a \"query by example\" (wildcard: \"%\")" msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns" -msgstr "Suorita mallin mukainen kysely (jokerimerkki: \"%\")" +msgstr "" +"Suorita mallin mukainen kysely (jokerimerkki: \"%\") kahteen eri sarakkeeseen" #: libraries/TableSearch.class.php:1088 msgid "Do a \"query by example\" (wildcard: \"%\")" @@ -3037,16 +3023,14 @@ msgid "Browse/Edit the points" msgstr "" #: libraries/TableSearch.class.php:1155 -#, fuzzy #| msgid "Control user" msgid "How to use" -msgstr "Hallintakäyttäjä" +msgstr "Kuinka käytetään" #: libraries/TableSearch.class.php:1160 -#, fuzzy #| msgid "Reset" msgid "Reset zoom" -msgstr "Palauta" +msgstr "Palauta zoomaus" #: libraries/Theme.class.php:169 #, php-format @@ -5605,8 +5589,8 @@ msgid "" "Leave blank for no \"persistent\" tables'UI preferences across sessions, " "suggested: [kbd]pma_table_uiprefs[/kbd]" msgstr "" -"Jätä tyhjäksi, jos et halua SQL-kyselyhistorian tukea; oletusarvo: [kbd]" -"pma_history[/kbd]" +"Jätä tyhjäksi, jos et halua SQL-kyselyhistorian tukea; oletusarvo: " +"[kbd]pma_table_uiprefs[/kbd]" #: libraries/config/messages.inc.php:436 msgid "UI preferences table" @@ -5734,10 +5718,9 @@ msgid "Show or hide a column displaying the Creation timestamp for all tables" msgstr "" #: libraries/config/messages.inc.php:461 -#, fuzzy #| msgid "Show versions" msgid "Show Creation timestamp" -msgstr "Näytä versiot" +msgstr "Näytä luonnin aikaleima" #: libraries/config/messages.inc.php:462 msgid "" @@ -5754,10 +5737,9 @@ msgid "" msgstr "" #: libraries/config/messages.inc.php:465 -#, fuzzy #| msgid "Show master status" msgid "Show Last check timestamp" -msgstr "Näytä isäntäpalvelimen tila" +msgstr "Näytä viimeisin tarkastus aikaleima" #: libraries/config/messages.inc.php:466 msgid "" @@ -6250,52 +6232,44 @@ msgid "Exporting rows from \"%s\" table" msgstr "Tuo rivejä taulusta %s" #: libraries/display_export.lib.php:95 -#, fuzzy #| msgid "Export type" msgid "Export Method:" -msgstr "Vientityyppi" +msgstr "Vientitapa:" #: libraries/display_export.lib.php:111 -#, fuzzy #| msgid "Quick - display only the minimal options to configure" msgid "Quick - display only the minimal options" -msgstr "Nopea asetusten määritys - näytä asetuksia mahdollisimman vähän" +msgstr "Nopea - näytä vain vähän vaihtoehtoja" #: libraries/display_export.lib.php:127 -#, fuzzy #| msgid "Custom - display all possible options to configure" msgid "Custom - display all possible options" -msgstr "Mukautettu - näytä kaikki mahdolliset asetukset" +msgstr "Mukautettu - näytä kaikki mahdolliset vaihtoehdot" #: libraries/display_export.lib.php:135 -#, fuzzy #| msgid "Databases" msgid "Database(s):" -msgstr "Tietokannat" +msgstr "Tietokanta(-kannat):" #: libraries/display_export.lib.php:137 -#, fuzzy #| msgid "Tables" msgid "Table(s):" -msgstr "Taulut" +msgstr "Taulu(t):" #: libraries/display_export.lib.php:147 -#, fuzzy #| msgid "Rows" msgid "Rows:" -msgstr "Kpl rivejä" +msgstr "Rivit:" #: libraries/display_export.lib.php:155 -#, fuzzy #| msgid "Dump all rows" msgid "Dump some row(s)" -msgstr "Vedosta kaikki rivit" +msgstr "Vedosta rivi/rivejä" #: libraries/display_export.lib.php:157 -#, fuzzy #| msgid "Number of fields" msgid "Number of rows:" -msgstr "Kenttien määrä" +msgstr "Rivien määrä:" #: libraries/display_export.lib.php:160 msgid "Row to begin at:" @@ -6310,22 +6284,20 @@ msgid "Output:" msgstr "" #: libraries/display_export.lib.php:186 libraries/display_export.lib.php:212 -#, fuzzy, php-format +#, php-format #| msgid "Save on server in %s directory" msgid "Save on server in the directory %s" -msgstr "Tallenna palvelimelle hakemistoon %s" +msgstr "Tallenna palvelimelle hakemistoon %s" #: libraries/display_export.lib.php:204 -#, fuzzy #| msgid "Save as file" msgid "Save output to a file" -msgstr "Tallenna tiedostoon" +msgstr "Tallenna tulos tiedostoon" #: libraries/display_export.lib.php:225 -#, fuzzy #| msgid "File name template" msgid "File name template:" -msgstr "Tiedostonimen pohja" +msgstr "Tiedostonimen pohja:" #: libraries/display_export.lib.php:227 msgid "@SERVER@ will become the server name" @@ -6340,7 +6312,7 @@ msgid ", @TABLE@ will become the table name" msgstr "" #: libraries/display_export.lib.php:235 -#, fuzzy, php-format +#, php-format #| msgid "" #| "alue is interpreted using %1$sstrftime%2$s, so you can use time matting " #| "ings. Additionally the following transformations will pen: %3$s. Other t " @@ -6350,9 +6322,9 @@ msgid "" "formatting strings. Additionally the following transformations will happen: " "%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." msgstr "" -"Tämä arvo on %1$sstrftime%2$s-funktion mukainen, joten " -"ajanmuodostostusmerkkijonoja voi käyttää. Lisäksi tapahtuu seuraavat " -"muutokset: %3$s. Muu teksti pysyy alkuperäisenä." +"Tämä arvo on tukittu %1$sstrftime%2$s mukaan, joten voi käyttää " +"ajanmuodostostusmerkkijonoja. Lisäksi tapahtuu seuraavat muutokset: %3$s. " +"Muu teksti pysyy alkuperäisenä. Katso lisätietoja %4$sFAQ%5$s." #: libraries/display_export.lib.php:285 msgid "use this for future exports" @@ -6364,10 +6336,9 @@ msgid "Character set of the file:" msgstr "Tiedoston merkistö:" #: libraries/display_export.lib.php:321 -#, fuzzy #| msgid "Compression" msgid "Compression:" -msgstr "Pakkaus" +msgstr "Pakkaus:" #: libraries/display_export.lib.php:325 msgid "zipped" @@ -6382,23 +6353,20 @@ msgid "bzipped" msgstr "BZIP-pakattu" #: libraries/display_export.lib.php:338 -#, fuzzy #| msgid "Save as file" msgid "View output as text" -msgstr "Tallenna tiedostoon" +msgstr "Näytä tulos tekstinä" #: libraries/display_export.lib.php:343 libraries/display_import.lib.php:296 #: libraries/export/codegen.php:56 -#, fuzzy #| msgid "Format" msgid "Format:" -msgstr "Muoto" +msgstr "Muoto:" #: libraries/display_export.lib.php:348 -#, fuzzy #| msgid "Transformation options" msgid "Format-specific options:" -msgstr "Muunnosvaihtoehdot" +msgstr "Muotoiluvaihtoehdot:" #: libraries/display_export.lib.php:349 msgid "" @@ -6407,10 +6375,9 @@ msgid "" msgstr "" #: libraries/display_export.lib.php:357 libraries/display_import.lib.php:311 -#, fuzzy #| msgid "Recoding engine" msgid "Encoding Conversion:" -msgstr "Merkistön uudelleenkoodaus" +msgstr "Merkistön uudelleenkoodaus:" #: libraries/display_git_revision.lib.php:56 #, php-format @@ -6453,10 +6420,9 @@ msgid "%s of %s" msgstr "" #: libraries/display_import.lib.php:78 -#, fuzzy #| msgid "Format of imported file" msgid "Uploading your import file..." -msgstr "Tuotavan tiedoston muoto" +msgstr "Lataa tuontitiedostoa..." #: libraries/display_import.lib.php:86 #, php-format @@ -6484,28 +6450,26 @@ msgstr "" "saatavilla." #: libraries/display_import.lib.php:178 -#, fuzzy #| msgid "Cannot log in to the MySQL server" msgid "Importing into the current server" -msgstr "MySQL-palvelimelle ei voitu kirjautua" +msgstr "Tuonti nykyiselle palvalimelle" #: libraries/display_import.lib.php:180 -#, fuzzy, php-format +#, php-format #| msgid "Go to database" msgid "Importing into the database \"%s\"" -msgstr "Siirry tietokantaan" +msgstr "Tuonti tietokantaan \"%s\"" #: libraries/display_import.lib.php:182 -#, fuzzy, php-format +#, php-format #| msgid "Go to database" msgid "Importing into the table \"%s\"" -msgstr "Siirry tietokantaan" +msgstr "Tuonti tauluun \"%s\"" #: libraries/display_import.lib.php:188 -#, fuzzy #| msgid "File to import" msgid "File to Import:" -msgstr "Tuotava tiedosto" +msgstr "Tuotava tiedosto:" #: libraries/display_import.lib.php:205 #, php-format @@ -6523,10 +6487,9 @@ msgid "File uploads are not allowed on this server." msgstr "Tällä palvelimella ei ole sallittu tiedostojen lähetystä." #: libraries/display_import.lib.php:260 -#, fuzzy #| msgid "Partial import" msgid "Partial Import:" -msgstr "Osittainen tuonti" +msgstr "Osittainen tuonti:" #: libraries/display_import.lib.php:266 #, php-format @@ -6537,7 +6500,6 @@ msgstr "" "uudestaan, jatkamme kohdasta %d." #: libraries/display_import.lib.php:273 -#, fuzzy #| msgid "" #| "the interruption of an import in case the script detects it is se to the " #| "timeout limit. This might be good way to import large es, however it " @@ -6547,15 +6509,14 @@ msgid "" "to the PHP timeout limit. (This might be good way to import large files, " "however it can break transactions.)" msgstr "" -"Anna tuonnin keskeytyä, mikäli skripti huomaa ylittävänsä aikarajoituksen. " -"Tätä kannattaa käyttää tuotaessa suuria tiedostoja; se voi kuitenkin " -"aiheuttaa häiriöitä transaktioihin." +"Mahdollistaa tuonnin keskeytyksen, mikäli skripti päättyy PHP:n " +"aikarajoituksen. (Tätä kannattaa käyttää tuotaessa suuria tiedostoja, se " +"voi kuitenkin aiheuttaa häiriöitä transaktioihin.)" #: libraries/display_import.lib.php:280 -#, fuzzy #| msgid "Number of records (queries) to skip from start" msgid "Number of rows to skip, starting from the first row:" -msgstr "Alusta ohitettavien tietueiden (kyselyjen) määrä" +msgstr "Ohitettavien rivien määrä, aloitus ensimmäisestä rivistä:" #: libraries/display_import.lib.php:302 msgid "Format-Specific Options:" @@ -6905,20 +6866,18 @@ msgid "" msgstr "" #: libraries/engines/pbxt.lib.php:133 -#, fuzzy #| msgid "Relations" msgid "Related Links" -msgstr "Relaatiot" +msgstr "Riippuvuudet" #: libraries/engines/pbxt.lib.php:135 msgid "The PrimeBase XT Blog by Paul McCullagh" msgstr "" #: libraries/export/csv.php:34 libraries/import/csv.php:46 -#, fuzzy #| msgid "Lines terminated by" msgid "Columns separated with:" -msgstr "Rivien erotinmerkki" +msgstr "Sarakkeiden erotin:" #: libraries/export/csv.php:39 libraries/import/csv.php:53 #, fuzzy @@ -6933,38 +6892,33 @@ msgid "Columns escaped with:" msgstr "Koodinvaihtomerkki" #: libraries/export/csv.php:49 libraries/import/csv.php:67 -#, fuzzy #| msgid "Lines terminated by" msgid "Lines terminated with:" -msgstr "Rivien erotinmerkki" +msgstr "Rivien lopetusmerkki:" #: libraries/export/csv.php:54 libraries/export/excel.php:33 #: libraries/export/htmlword.php:56 libraries/export/latex.php:150 #: libraries/export/ods.php:34 libraries/export/odt.php:98 -#, fuzzy #| msgid "Replace NULL by" msgid "Replace NULL with:" -msgstr "Korvaa NULL-merkki tällä:" +msgstr "Korvaa NULL-merkki:" #: libraries/export/csv.php:60 libraries/export/excel.php:39 -#, fuzzy #| msgid "Remove CRLF characters within fields" msgid "Remove carriage return/line feed characters within columns" -msgstr "Poista kentistä CRLF-merkit" +msgstr "Poista sarakkeista CR/LF-merkit" #: libraries/export/excel.php:54 -#, fuzzy #| msgid "Excel edition" msgid "Excel edition:" -msgstr "Excel-muokkaus" +msgstr "Excel-muotoilu:" #: libraries/export/htmlword.php:50 libraries/export/latex.php:121 #: libraries/export/odt.php:87 libraries/export/sql.php:269 #: libraries/export/texytext.php:47 libraries/export/xml.php:83 -#, fuzzy #| msgid "Databases display options" msgid "Data dump options" -msgstr "Tietokantojen näyttöasetukset" +msgstr "Tiedon vedostusasetukset" #: libraries/export/htmlword.php:170 libraries/export/odt.php:224 #: libraries/export/sql.php:1536 libraries/export/texytext.php:152 @@ -6981,10 +6935,9 @@ msgstr "Tapahtuma" #: libraries/export/texytext.php:410 libraries/rte/rte_events.lib.php:469 #: libraries/rte/rte_routines.lib.php:927 #: libraries/rte/rte_triggers.lib.php:362 -#, fuzzy #| msgid "Description" msgid "Definition" -msgstr "Kuvaus" +msgstr "Määritys" #: libraries/export/htmlword.php:518 libraries/export/odt.php:615 #: libraries/export/sql.php:1308 libraries/export/texytext.php:471 @@ -7002,46 +6955,40 @@ msgid "Stand-in structure for view" msgstr "Näkymän vararakenne" #: libraries/export/latex.php:14 -#, fuzzy #| msgid "Content of table __TABLE__" msgid "Content of table @TABLE@" -msgstr "Taulun __TABLE__ sisältö" +msgstr "Taulun @TABLE@ sisältö" #: libraries/export/latex.php:15 msgid "(continued)" msgstr "(jatkuu)" #: libraries/export/latex.php:16 -#, fuzzy #| msgid "Structure of table __TABLE__" msgid "Structure of table @TABLE@" -msgstr "Taulun __TABLE__ rakenne" +msgstr "Taulun @TABLE@ rakenne" #: libraries/export/latex.php:72 libraries/export/odt.php:56 #: libraries/export/sql.php:171 -#, fuzzy #| msgid "Transformation options" msgid "Object creation options" -msgstr "Muunnosvaihtoehdot" +msgstr "Objektin luontivaihtoehdot" #: libraries/export/latex.php:84 libraries/export/latex.php:138 -#, fuzzy #| msgid "Table caption" msgid "Table caption (continued)" -msgstr "Taulun otsikko" +msgstr "Taulun otsikko (jatkuu)" #: libraries/export/latex.php:97 libraries/export/odt.php:63 #: libraries/export/sql.php:68 -#, fuzzy #| msgid "Disable foreign key checks" msgid "Display foreign key relationships" -msgstr "Älä tarkista viiteavaimia" +msgstr "Näytä viiteavaimien suhteet" #: libraries/export/latex.php:103 libraries/export/odt.php:69 -#, fuzzy #| msgid "Displaying Column Comments" msgid "Display comments" -msgstr "Sarakkeiden kommentit näkyvissä" +msgstr "Näytä kommentit" #: libraries/export/latex.php:109 libraries/export/odt.php:75 #: libraries/export/sql.php:75 @@ -7078,10 +7025,9 @@ msgid "MediaWiki Table" msgstr "MediaWiki-taulu" #: libraries/export/mediawiki.php:53 -#, fuzzy #| msgid "Export contents" msgid "Export table names" -msgstr "Vie sisällöt" +msgstr "Vie taulujen nimet" #: libraries/export/mediawiki.php:60 msgid "Export table headers" @@ -7110,10 +7056,9 @@ msgid "" msgstr "" #: libraries/export/sql.php:54 -#, fuzzy #| msgid "Add custom comment into header (\\n splits lines)" msgid "Additional custom header comment (\\n splits lines):" -msgstr "Lisää oma kommentti otsikkoon (\\n on rivinvaihto)" +msgstr "Lisää oma kommentti otsikkoon (\\n on rivinvaihto):" #: libraries/export/sql.php:60 msgid "" @@ -7128,16 +7073,15 @@ msgstr "" #: libraries/export/sql.php:136 libraries/export/sql.php:204 #: libraries/export/sql.php:212 -#, fuzzy, php-format +#, php-format #| msgid "Statements" msgid "Add %s statement" -msgstr "Tieto" +msgstr "Lisää %s lauseke" #: libraries/export/sql.php:181 -#, fuzzy #| msgid "Statements" msgid "Add statements:" -msgstr "Tieto" +msgstr "Lisää lausekkeet:" #: libraries/export/sql.php:253 msgid "" @@ -7246,20 +7190,18 @@ msgid "Object creation options (all are recommended)" msgstr "" #: libraries/export/xml.php:72 -#, fuzzy #| msgid "View" msgid "Views" -msgstr "Näkymä" +msgstr "Näkymät" #: libraries/export/xml.php:88 msgid "Export contents" msgstr "Vie sisällöt" #: libraries/gis_visualization.lib.php:135 -#, fuzzy #| msgid "No data found for the chart." msgid "No data found for GIS visualization." -msgstr "Kaaviolle ei ole tietoja." +msgstr "GIS visualisoinnille ei ole tietoja." #: libraries/import.lib.php:170 libraries/insert_edit.lib.php:128 #: libraries/rte/rte_routines.lib.php:1258 sql.php:828 tbl_get_field.php:36 From ae75f78408ed8ce3bbe9ab201871996016f566ec Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 24 Jun 2012 12:54:22 +0200 Subject: [PATCH 02/24] Translated using Weblate. --- po/si.po | 82 +++++++++++++++++++++----------------------------------- 1 file changed, 30 insertions(+), 52 deletions(-) diff --git a/po/si.po b/po/si.po index 4b656d41a1..e7ea64d3c3 100644 --- a/po/si.po +++ b/po/si.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-06-18 10:54+0200\n" -"PO-Revision-Date: 2012-05-11 19:33+0200\n" +"PO-Revision-Date: 2012-06-24 12:42+0200\n" "Last-Translator: Madhura Jayaratne \n" "Language-Team: sinhala \n" "Language: si\n" @@ -2325,10 +2325,10 @@ msgid "" msgstr "" #: 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 "CSV ආනයනයේ %d පේළියේ වැරදි ආකෘතියක්." +msgstr "%s වන පේළියේ වැරදි රීති අර්ථදැක්වීමකි" #: libraries/Advisor.class.php:386 #, php-format @@ -2427,7 +2427,7 @@ msgid "vertical" msgstr "සිරස්" #: libraries/DisplayResults.class.php:702 -#, fuzzy, php-format +#, php-format #| msgid "Headers every %s rows" msgid "Headers every %s rows" msgstr "ශීර්ෂක, පේළි %s කට වරක්" @@ -2983,10 +2983,9 @@ msgid "How to use" msgstr "භාවිතා කරන අයුරු" #: libraries/TableSearch.class.php:1160 -#, fuzzy #| msgid "Reset" msgid "Reset zoom" -msgstr "ප්‍රතිසකසන්න" +msgstr "සූමය ප්‍රතිසකසන්න" #: libraries/Theme.class.php:169 #, php-format @@ -3283,25 +3282,22 @@ msgid "Numeric" msgstr "" #: libraries/Types.class.php:642 libraries/Types.class.php:976 -#, fuzzy #| msgid "Create an index" msgctxt "date and time types" msgid "Date and time" -msgstr "නව සූචියක් සාදන්න" +msgstr "දිනය සහ වේලාව" #: libraries/Types.class.php:651 libraries/Types.class.php:979 -#, fuzzy #| msgid "Linestring" msgctxt "string types" msgid "String" -msgstr "රේඛාව" +msgstr "පෙළ" #: libraries/Types.class.php:672 -#, fuzzy #| msgid "Spatial" msgctxt "spatial types" msgid "Spatial" -msgstr "ජ්‍යාමිතික" +msgstr "අවකාශීය" #: libraries/Types.class.php:707 msgid "A 4-byte integer, range is -2,147,483,648 to 2,147,483,647" @@ -4819,10 +4815,9 @@ msgid "Minimum number of tables to display the table filter box" msgstr "වගු පෙරහන් කවුළුව පෙන්වීමට අවම වශයෙන් තිබිය යුතු වගු ගණන" #: libraries/config/messages.inc.php:281 -#, fuzzy #| msgid "Minimum number of tables to display the table filter box" msgid "Minimum number of databases to display the database filter box" -msgstr "වගු පෙරහන් කවුළුව පෙන්වීමට අවම වශයෙන් තිබිය යුතු වගු ගණන" +msgstr "දත්තගබඩා පෙරහන් කවුළුව පෙන්වීමට අවම වශයෙන් තිබිය යුතු දත්තගබඩා ගණන" #: libraries/config/messages.inc.php:282 msgid "String that separates databases into different tree levels" @@ -6290,9 +6285,8 @@ msgstr "" "තෝරාගත් ආකෘතිය සඳහා විකල්ප භාවිතා කිරීමට පහලට යන්න. අනෙකුත් ආකෘති සඳහා විකල්ප නොසලකන්න." #: libraries/display_export.lib.php:357 libraries/display_import.lib.php:311 -#, fuzzy msgid "Encoding Conversion:" -msgstr "MySQL සේවාදායකයාගේ සංස්කරණය" +msgstr "කේතීකරණ පරිවර්තනය:" #: libraries/display_git_revision.lib.php:56 #, php-format @@ -7165,10 +7159,10 @@ msgid "This plugin does not support compressed imports!" msgstr "මෙම පේණුව හැකිළු ආනයන සඳහා සහාය නොදක්වයි!" #: 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:
%s." -msgstr "CSV ආනයනයේ %d පේළියේ වැරදි ආකෘතියක්." +msgstr "Mediawiki ආනයනයේ වැරදි ආකෘතියකි, පේළිය:
%s." #: libraries/import/ods.php:49 msgid "Import percentages as proper decimals (ex. 12.00% to .12)" @@ -8441,10 +8435,9 @@ msgid "Index" msgstr "සූචිය" #: libraries/tbl_properties.inc.php:121 -#, fuzzy #| msgid "Remove column(s)" msgid "Move column" -msgstr "පේළි(යක්) ඉවත් කරන්න" +msgstr "පේළිය ගෙනයන්න" #: libraries/tbl_properties.inc.php:130 #, php-format @@ -8497,7 +8490,7 @@ msgid "first" msgstr "" #: libraries/tbl_properties.inc.php:599 -#, fuzzy, php-format +#, php-format #| msgid "After %s" msgid "after %s" msgstr "%s ට පසු" @@ -8847,10 +8840,9 @@ msgid "No databases" msgstr "දත්තගබඩා නොමැත" #: navigation.php:170 -#, fuzzy #| msgid "Filter tables by name" msgid "Filter databases by name" -msgstr "වගු නමින් පෙරහන්න" +msgstr "දත්තගබඩා නමින් පෙරහන්න" #: navigation.php:239 msgid "Filter tables by name" @@ -10298,18 +10290,12 @@ msgid "The amount of data written so far, in bytes." msgstr "මේ දක්වා ලියැවුණු දත්ත ප්‍රමාණය, බයිට වලින්." #: server_status.php:1364 -#, fuzzy msgid "The number of pages that have been written for doublewrite operations." -msgstr "" -"The number of doublewrite writes that have been performed and the number of " -"pages that have been written for this purpose." +msgstr "ද්විත්ව-ලිවීම් මෙහෙයුම් සඳහා ලියැවුණු පිටු ගණන." #: server_status.php:1365 -#, fuzzy msgid "The number of doublewrite operations that have been performed." -msgstr "" -"The number of doublewrite writes that have been performed and the number of " -"pages that have been written for this purpose." +msgstr "සිදු කෙරුණු ද්විත්ව-ලිවීම් මෙහෙයුම් ගණන." #: server_status.php:1366 msgid "" @@ -10416,10 +10402,9 @@ msgid "" msgstr "" #: server_status.php:1389 -#, fuzzy #| msgid "Format of imported file" msgid "Percentage of used key cache (calculated value)" -msgstr "ආනයනය කරන ලද ගොනුවේ ආකෘතිය" +msgstr "යතුරු කෑෂයේ භාවිතා කරන ලද ප්‍රතිශතය (ගණනය කරන ලද අගයකි)" #: server_status.php:1390 msgid "The number of requests to read a key block from the cache." @@ -11303,10 +11288,9 @@ msgid "Table %1$s has been altered successfully" msgstr "%1$s වගුව සාර්ථකව වෙනස් කරන ලදි" #: tbl_alter.php:131 -#, fuzzy #| msgid "The selected users have been deleted successfully." msgid "The columns have been moved successfully." -msgstr "තෝරාගත් භාවිතා කරන්නන් සාර්ථකව ඉවත් කරන ලදි." +msgstr "තීර සාර්ථකව ගෙන යන ලදි." #: tbl_chart.php:83 msgctxt "Chart type" @@ -11924,10 +11908,9 @@ msgid "The uptime is only %s" msgstr "" #: libraries/advisory_rules.txt:56 -#, fuzzy #| msgid "Versions" msgid "Questions below 1,000" -msgstr "අනුවාද" +msgstr "ප්‍රශ්න ගණන 1,000 ට වඩා අඩුය" #: libraries/advisory_rules.txt:59 msgid "" @@ -11942,10 +11925,10 @@ msgid "" msgstr "" #: libraries/advisory_rules.txt:61 -#, fuzzy, php-format +#, php-format #| msgid "Current connection" msgid "Current amount of Questions: %s" -msgstr "වත්මන් සම්බන්දතාව" +msgstr "වත්මන් ප්‍රශ්න ගණන: %s" #: libraries/advisory_rules.txt:63 msgid "Percentage of slow queries" @@ -12000,7 +11983,7 @@ msgid "" msgstr "" #: libraries/advisory_rules.txt:82 -#, fuzzy, php-format +#, php-format #| msgid "long_query_time is set to %d second(s)." msgid "long_query_time is currently set to %ds." msgstr "long_query_time තත්පර %d කට සිටුවා ඇත." @@ -12010,10 +11993,9 @@ msgid "Slow query logging" msgstr "මන්දගාමී විමසුම් ලොගගත කිරීම" #: libraries/advisory_rules.txt:87 -#, fuzzy #| msgid "slow_query_log is enabled." msgid "The slow query log is disabled." -msgstr "slow_query_log සක්‍රීය යි." +msgstr "වැඩි කාලයක් ගන්න විමසුම් සටහන් කරනා ලොගය අක්‍රීය යි." #: libraries/advisory_rules.txt:88 msgid "" @@ -12022,10 +12004,9 @@ msgid "" msgstr "" #: libraries/advisory_rules.txt:89 -#, fuzzy #| msgid "long_query_time is set to %d second(s)." msgid "log_slow_queries is set to 'OFF'" -msgstr "long_query_time තත්පර %d කට සිටුවා ඇත." +msgstr "log_slow_queries, 'OFF'(අක්‍රීය) වෙත පිහිටුවා ඇත" #: libraries/advisory_rules.txt:93 #, fuzzy @@ -12068,10 +12049,9 @@ msgid "Version less than 5.5.8 (the first GA release of 5.5)." msgstr "" #: libraries/advisory_rules.txt:111 -#, fuzzy #| msgid "You should upgrade to %s %s or later." msgid "You should upgrade, to a stable version of MySQL 5.5" -msgstr "You should upgrade to %s %s or later." +msgstr "ඔබ MySQL 5.5 හි ස්ථාවර අනුවාදයක් වෙත යාවත්කාලීන කල යුතුය" #: libraries/advisory_rules.txt:114 libraries/advisory_rules.txt:121 #: libraries/advisory_rules.txt:128 @@ -12115,10 +12095,9 @@ msgid "Version string (%s) matches Drizzle versioning scheme" msgstr "" #: libraries/advisory_rules.txt:135 -#, fuzzy #| msgid "MySQL charset" msgid "MySQL Architecture" -msgstr "MySQL අක්ෂර කට්ටලය" +msgstr "MySQL නිර්මිතය" #: libraries/advisory_rules.txt:138 msgid "MySQL is not compiled as a 64-bit package." @@ -12161,10 +12140,9 @@ msgid "Query caching method" msgstr "විමසුම් කෑෂ්ගත කරන ක්‍රමය" #: libraries/advisory_rules.txt:156 -#, fuzzy #| msgid "Query caching method" msgid "Suboptimal caching method." -msgstr "විමසුම් කෑෂ්ගත කරන ක්‍රමය" +msgstr "කෑෂ්ගත කරන ක්‍රමය ප්‍රශස්ත නැත." #: libraries/advisory_rules.txt:157 msgid "" @@ -12297,10 +12275,10 @@ msgid "" msgstr "" #: libraries/advisory_rules.txt:193 -#, fuzzy, php-format +#, php-format #| msgid "Current version: %s" msgid "Current query cache size: %s" -msgstr "වත්මන් අනුවාදය: %s" +msgstr "වත්මන් විමසුම් කෑෂයේ ප්‍රමාණය: %s" #: libraries/advisory_rules.txt:195 msgid "Query cache min result size" From 8eb0f2f22b3f73b7fe316d4df4f817db8c366d71 Mon Sep 17 00:00:00 2001 From: "J.M" Date: Sun, 24 Jun 2012 17:49:53 +0200 Subject: [PATCH 03/24] Use checkbox for checking/unchecking all rows in a table --- db_structure.php | 11 ++--- js/functions.js | 41 ++++++++++++++--- libraries/DisplayResults.class.php | 69 +++++++++-------------------- libraries/build_html_for_db.lib.php | 2 +- server_databases.php | 8 ++-- server_privileges.php | 13 ++---- tbl_structure.php | 13 ++---- 7 files changed, 72 insertions(+), 85 deletions(-) diff --git a/db_structure.php b/db_structure.php index 9424391ee0..4b36a556af 100644 --- a/db_structure.php +++ b/db_structure.php @@ -453,7 +453,7 @@ foreach ($tables as $keyname => $each_table) { ?>" id="row_tbl_"> - /> @@ -675,13 +675,8 @@ $checkall_url = 'db_structure.php?' . PMA_generate_common_url($db); ?> <?php echo __('With selected:'); ?> - - -/ - - + + / 0) { + $checkall.prop({checked: true, indeterminate: true}); + } + else { + $checkall.prop({checked: false, indeterminate: false}); + } +}); +$("input#checkall").live("change", function() { + var is_checked = $(this).is(":checked"); + $(this.form).find(checkboxes_sel).prop("checked", is_checked) + .parents("tr").toggleClass("marked", is_checked); +}); + /** * Toggles row colors of a set of 'tr' elements starting from a given element * diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 4e86431c1b..2d0fb66dd4 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -4220,34 +4220,8 @@ class PMA_DisplayResults 'sql_query' => $this->_sql_query, 'goto' => $this->_goto, ); - $uncheckall_url = 'sql.php' . PMA_generate_common_url($_url_params); - $_url_params['checkall'] = '1'; - $checkall_url = 'sql.php' . PMA_generate_common_url($_url_params); - if ($_SESSION['tmp_user_values']['disp_direction'] == self::DISP_DIR_VERTICAL) { - - $checkall_params['onclick'] - = 'if (setCheckboxes(\'resultsForm\', true)) return false;'; - $uncheckall_params['onclick'] - = 'if (setCheckboxes(\'resultsForm\', false)) return false;'; - - } else { - - $checkall_params['onclick'] - = 'if (markAllRows(\'resultsForm\')) return false;'; - $uncheckall_params['onclick'] - = 'if (unMarkAllRows(\'resultsForm\')) return false;'; - - } - - $checkall_link = PMA_linkOrButton( - $checkall_url, __('Check All'), $checkall_params, false - ); - - $uncheckall_link = PMA_linkOrButton( - $uncheckall_url, __('Uncheck All'), $uncheckall_params, false - ); if ($_SESSION['tmp_user_values']['disp_direction'] != self::DISP_DIR_VERTICAL) { @@ -4257,10 +4231,9 @@ class PMA_DisplayResults . ' alt="' . __('With selected:') . '" />'; } - $links_html .= $checkall_link . "\n" - . ' / ' . "\n" - . $uncheckall_link . "\n" - . '' . __('With selected:') . '' . "\n"; + $links_html .= ' ' + . ' ' + . '' . __('With selected:') . '' . "\n"; $links_html .= PMA_getButtonOrImage( 'submit_mult', 'mult_submit', 'submit_mult_change', @@ -4496,13 +4469,13 @@ class PMA_DisplayResults * @param string $transform_options transformation parameters * @param string $default_function default transformation function * @param object $meta the meta-information about this field - * @param array $url_params parameters that should go to the + * @param array $url_params parameters that should go to the * download link * * @return mixed string or float - * + * * @access private - * + * * @see _getDataCellForBlobColumns(), _getDataCellForGeometryColumns(), * _getDataCellForNonNumericAndNonBlobColumns(), * _getSortedColumnMessage() @@ -4581,12 +4554,12 @@ class PMA_DisplayResults * @param bool $is_field_truncated whether the field is truncated * * @return string formatted data - * + * * @access private - * + * * @see _getDataCellForNumericColumns(), _getDataCellForGeometryColumns(), * _getDataCellForNonNumericAndNonBlobColumns(), - * + * */ private function _getRowData( $class, $condition_field, $analyzed_sql, $meta, $map, $data, @@ -4754,9 +4727,9 @@ class PMA_DisplayResults * @param string $class css classes for the td element * * @return string the generated HTML - * + * * @access private - * + * * @see _getTableBody(), _getCheckboxAndLinks() */ private function _getCheckboxForMultiRowSubmissions( @@ -4777,7 +4750,7 @@ class PMA_DisplayResults . ' diff --git a/libraries/build_html_for_db.lib.php b/libraries/build_html_for_db.lib.php index 12aa55d07f..12a163173c 100644 --- a/libraries/build_html_for_db.lib.php +++ b/libraries/build_html_for_db.lib.php @@ -79,7 +79,7 @@ function PMA_buildHtmlForDb( $out = ''; if ($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) { $out .= ''; - $out .= ' 0) { if ($is_superuser || $cfg['AllowUserDropDatabase']) { $common_url_query = PMA_generate_common_url(array('sort_by' => $sort_by, 'sort_order' => $sort_order, 'dbstats' => $dbstats)); echo '' . __('With selected:') . '' . "\n" - . '' . "\n" - . ' ' . __('Check All') . ' / ' . "\n" - . '' . "\n" - . ' ' . __('Uncheck All') . '' . "\n" - . '' . __('With selected:') . '' . "\n"; + . ' ' + . ' ' + . '' . __('With selected:') . '' . "\n"; echo PMA_getButtonOrImage('drop_selected_dbs', 'mult_submit' . ($cfg['AjaxEnable'] ? ' ajax' : ''), 'drop_selected_dbs', __('Drop'), 'b_deltbl.png'); } diff --git a/server_privileges.php b/server_privileges.php index 4b302af73e..74cce6e2d4 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1879,7 +1879,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs foreach ($user as $host) { $index_checkbox++; echo ' ' . "\n" - . ' ' . "\n" - .'' - . __('Check All') . '' . "\n" - .'/' . "\n" - .'' - . __('Uncheck All') . '' . "\n" - .'' . __('With selected:') . '' . "\n"; + .' ' + .' ' + .'' . __('With selected:') . '' . "\n"; echo PMA_getButtonOrImage( 'submit_mult', 'mult_submit', 'submit_mult_export', diff --git a/tbl_structure.php b/tbl_structure.php index 8ccc21782d..7ffb4b4782 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -334,7 +334,7 @@ foreach ($fields as $row) { ?> - /> + /> @@ -559,15 +559,10 @@ $checkall_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table); <?php echo __('With selected:'); ?> - - -/ - - + + - + Date: Sun, 24 Jun 2012 21:01:36 +0200 Subject: [PATCH 04/24] Another try to fix PHP 5.4-based upload progress --- import_status.php | 63 ++++++++++++++--------------------------------- 1 file changed, 18 insertions(+), 45 deletions(-) diff --git a/import_status.php b/import_status.php index b544748b9d..d056c3e1d4 100644 --- a/import_status.php +++ b/import_status.php @@ -24,60 +24,33 @@ if (version_compare(PHP_VERSION, '5.4.0', '>=') && ini_get('session.upload_progress.enabled') ) { - if (!isset($_POST['session_upload_progress'])) { - $sessionupload = array(); - $prefix = ini_get('session.upload_progress.prefix'); + $sessionupload = array(); + $prefix = ini_get('session.upload_progress.prefix'); - session_start(); - foreach ($_SESSION as $key => $value) { - // only copy session-prefixed data - if (substr($key, 0, strlen($prefix)) == $prefix) { - $sessionupload[$key] = $value; - } + session_start(); + foreach ($_SESSION as $key => $value) { + // only copy session-prefixed data + if (substr($key, 0, strlen($prefix)) == $prefix) { + $sessionupload[$key] = $value; } - - // perform internal self-request - $url = 'http' . - ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 's' : '') . - '://' . $_SERVER['HTTP_HOST'] . - $_SERVER['REQUEST_URI']; - - if (!function_exists('curl_exec') || !function_exists('getallheaders')) { - die(); - } - $headers = @getallheaders(); - if (!isset($headers['Cookie'])) { - die(); - } - $ch = curl_init($url); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); - curl_setopt( - $ch, CURLOPT_POSTFIELDS, - 'session_upload_progress=' . rawurlencode(serialize($sessionupload)) - ); - curl_setopt($ch, CURLOPT_COOKIE, $headers['Cookie']); - curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 3); - curl_setopt($ch, CURLOPT_TIMEOUT, 3); - - // to avoid problems with self-signed certs - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); - curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0); - - // show the result of the internal request - echo @curl_exec($ch); - die(); } + // PMA will kill all variables, so let's use a constant + define('SESSIONUPLOAD', serialize($sessionupload)); + session_write_close(); + + session_name('phpMyAdmin'); + session_id($_COOKIE['phpMyAdmin']); } +define('PMA_MINIMUM_COMMON', 1); + require_once 'libraries/common.inc.php'; require_once 'libraries/display_import_ajax.lib.php'; -if (isset($_POST['session_upload_progress'])) { - // this is the internal request response - // restore sessionupload from the POSTed data (see above), - // then write sessionupload back into the loaded session +if (defined('SESSIONUPLOAD')) { + // write sessionupload back into the loaded PMA session - $sessionupload = unserialize($_POST['session_upload_progress']); + $sessionupload = unserialize(SESSIONUPLOAD); foreach ($sessionupload as $key => $value) { $_SESSION[$key] = $value; } From ed8e998307e87c811787654aba0f7f4ba041d457 Mon Sep 17 00:00:00 2001 From: "J.M" Date: Sun, 24 Jun 2012 21:08:54 +0200 Subject: [PATCH 05/24] Remove check for cURL support in PHP 5.4 upload progress handler, we dont need it anymore --- libraries/display_import_ajax.lib.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php index e0180a2b2e..d17e7b133c 100644 --- a/libraries/display_import_ajax.lib.php +++ b/libraries/display_import_ajax.lib.php @@ -83,8 +83,6 @@ function PMA_import_uploadprogressCheck() /** * Checks if PHP 5.4 session upload-progress feature is available. - * Due to a bug in PHP 5.4's session upload feature (see /import_status.php), - * we need to check for cURL support. * * @return boolean true if PHP 5.4 session upload-progress is available, * false if it is not @@ -93,7 +91,6 @@ function PMA_import_sessionCheck() { if (PMA_PHP_INT_VERSION < 50400 || ! ini_get('session.upload_progress.enabled') - || ! function_exists('curl_exec') ) { return false; } From 81f8b436e6b0ce819b2258837eaf157d769b6376 Mon Sep 17 00:00:00 2001 From: Jukka Penttinen Date: Mon, 25 Jun 2012 07:59:40 +0200 Subject: [PATCH 06/24] Translated using Weblate. --- po/fi.po | 224 ++++++++++++++++++++----------------------------------- 1 file changed, 80 insertions(+), 144 deletions(-) diff --git a/po/fi.po b/po/fi.po index c1f0123138..db9c0d407d 100644 --- a/po/fi.po +++ b/po/fi.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-04 13:42+0200\n" -"PO-Revision-Date: 2012-05-21 20:39+0200\n" +"PO-Revision-Date: 2012-06-24 00:18+0200\n" "Last-Translator: Jukka Penttinen \n" "Language-Team: finnish \n" "Language: fi\n" @@ -1535,10 +1535,9 @@ msgid "From general log" msgstr "Yleisestä lokista" #: js/messages.php:176 -#, fuzzy #| msgid "Loading logs" msgid "Analysing logs" -msgstr "Lokien lataus" +msgstr "Analyysilokit" #: js/messages.php:177 msgid "Analysing & loading logs. This may take a while." @@ -1576,10 +1575,9 @@ msgid "Jump to Log table" msgstr "Siirry lokitauluun" #: js/messages.php:184 -#, fuzzy #| msgid "No databases" msgid "No data found" -msgstr "Ei tietokantoja" +msgstr "Tietoa ei löydy" #: js/messages.php:185 msgid "Log analysed, but no data found in this time span." @@ -1616,16 +1614,14 @@ msgid "Chart" msgstr "Kaavio" #: js/messages.php:195 -#, fuzzy #| msgid "Apply index(s)" msgid "Edit chart" -msgstr "Käytä indeksiä/indeksejä" +msgstr "Muokkaa kaaviota" #: js/messages.php:196 -#, fuzzy #| msgid "SQL queries" msgid "Series" -msgstr "SQL-kyselyt" +msgstr "Sarjat" #. l10n: A collection of available filters #: js/messages.php:199 @@ -1701,16 +1697,14 @@ msgid "Import" msgstr "Tuonti" #: js/messages.php:217 -#, fuzzy #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Import monitor configuration" -msgstr "Oletusasetuksia ei voitu ladata kohteesta: \"%1$s\"" +msgstr "Tuo seuranta-asetukset" #: js/messages.php:218 -#, fuzzy #| msgid "Please select the primary key or a unique key" msgid "Please select the file you want to import" -msgstr "Valitse perusavain tai uniikki avain" +msgstr "Valitse tuotava tiedosto" #: js/messages.php:220 msgid "Analyse Query" @@ -4939,8 +4933,8 @@ msgid "" "Leave blank for no \"persistent\" tables'UI preferences across sessions, " "suggested: [kbd]pma_table_uiprefs[/kbd]" msgstr "" -"Jätä tyhjäksi, jos et halua SQL-kyselyhistorian tukea; oletusarvo: [kbd]" -"pma_history[/kbd]" +"Jätä tyhjäksi, jos et halua SQL-kyselyhistorian tukea; oletusarvo: " +"[kbd]pma_table_uiprefs[/kbd]" #: libraries/config/messages.inc.php:434 msgid "UI preferences table" @@ -5634,52 +5628,44 @@ msgid "Exporting rows from \"%s\" table" msgstr "Tuo rivejä taulusta %s" #: libraries/display_export.lib.php:92 -#, fuzzy #| msgid "Export type" msgid "Export Method:" -msgstr "Vientityyppi" +msgstr "Vientitapa:" #: libraries/display_export.lib.php:108 -#, fuzzy #| msgid "Quick - display only the minimal options to configure" msgid "Quick - display only the minimal options" -msgstr "Nopea asetusten määritys - näytä asetuksia mahdollisimman vähän" +msgstr "Nopea - näytä vain vähän vaihtoehtoja" #: libraries/display_export.lib.php:124 -#, fuzzy #| msgid "Custom - display all possible options to configure" msgid "Custom - display all possible options" -msgstr "Mukautettu - näytä kaikki mahdolliset asetukset" +msgstr "Mukautettu - näytä kaikki mahdolliset vaihtoehdot" #: libraries/display_export.lib.php:132 -#, fuzzy #| msgid "Databases" msgid "Database(s):" -msgstr "Tietokannat" +msgstr "Tietokanta(-kannat):" #: libraries/display_export.lib.php:134 -#, fuzzy #| msgid "Tables" msgid "Table(s):" -msgstr "Taulut" +msgstr "Taulu(t):" #: libraries/display_export.lib.php:144 -#, fuzzy #| msgid "Rows" msgid "Rows:" -msgstr "Kpl rivejä" +msgstr "Rivit:" #: libraries/display_export.lib.php:152 -#, fuzzy #| msgid "Dump all rows" msgid "Dump some row(s)" -msgstr "Vedosta kaikki rivit" +msgstr "Vedosta rivi/rivejä" #: libraries/display_export.lib.php:154 -#, fuzzy #| msgid "Number of fields" msgid "Number of rows:" -msgstr "Kenttien määrä" +msgstr "Rivien määrä:" #: libraries/display_export.lib.php:157 msgid "Row to begin at:" @@ -5694,22 +5680,20 @@ msgid "Output:" msgstr "" #: libraries/display_export.lib.php:183 libraries/display_export.lib.php:209 -#, fuzzy, php-format +#, php-format #| msgid "Save on server in %s directory" msgid "Save on server in the directory %s" -msgstr "Tallenna palvelimelle hakemistoon %s" +msgstr "Tallenna palvelimelle hakemistoon %s" #: libraries/display_export.lib.php:201 -#, fuzzy #| msgid "Save as file" msgid "Save output to a file" -msgstr "Tallenna tiedostoon" +msgstr "Tallenna tulos tiedostoon" #: libraries/display_export.lib.php:222 -#, fuzzy #| msgid "File name template" msgid "File name template:" -msgstr "Tiedostonimen pohja" +msgstr "Tiedostonimen pohja:" #: libraries/display_export.lib.php:224 msgid "@SERVER@ will become the server name" @@ -5724,7 +5708,7 @@ msgid ", @TABLE@ will become the table name" msgstr "" #: libraries/display_export.lib.php:232 -#, fuzzy, php-format +#, php-format #| msgid "" #| "alue is interpreted using %1$sstrftime%2$s, so you can use time matting " #| "ings. Additionally the following transformations will pen: %3$s. Other t " @@ -5734,9 +5718,9 @@ msgid "" "formatting strings. Additionally the following transformations will happen: " "%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." msgstr "" -"Tämä arvo on %1$sstrftime%2$s-funktion mukainen, joten " -"ajanmuodostostusmerkkijonoja voi käyttää. Lisäksi tapahtuu seuraavat " -"muutokset: %3$s. Muu teksti pysyy alkuperäisenä." +"Tämä arvo on tukittu %1$sstrftime%2$s mukaan, joten voi käyttää " +"ajanmuodostostusmerkkijonoja. Lisäksi tapahtuu seuraavat muutokset: %3$s. " +"Muu teksti pysyy alkuperäisenä. Katso lisätietoja %4$sFAQ%5$s." #: libraries/display_export.lib.php:270 msgid "use this for future exports" @@ -5748,10 +5732,9 @@ msgid "Character set of the file:" msgstr "Tiedoston merkistö:" #: libraries/display_export.lib.php:306 -#, fuzzy #| msgid "Compression" msgid "Compression:" -msgstr "Pakkaus" +msgstr "Pakkaus:" #: libraries/display_export.lib.php:310 msgid "zipped" @@ -5766,23 +5749,20 @@ msgid "bzipped" msgstr "BZIP-pakattu" #: libraries/display_export.lib.php:323 -#, fuzzy #| msgid "Save as file" msgid "View output as text" -msgstr "Tallenna tiedostoon" +msgstr "Näytä tulos tekstinä" #: libraries/display_export.lib.php:328 libraries/display_import.lib.php:244 #: libraries/export/codegen.php:38 -#, fuzzy #| msgid "Format" msgid "Format:" -msgstr "Muoto" +msgstr "Muoto:" #: libraries/display_export.lib.php:333 -#, fuzzy #| msgid "Transformation options" msgid "Format-specific options:" -msgstr "Muunnosvaihtoehdot" +msgstr "Muotoiluvaihtoehdot:" #: libraries/display_export.lib.php:334 msgid "" @@ -5791,10 +5771,9 @@ msgid "" msgstr "" #: libraries/display_export.lib.php:342 libraries/display_import.lib.php:260 -#, fuzzy #| msgid "Recoding engine" msgid "Encoding Conversion:" -msgstr "Merkistön uudelleenkoodaus" +msgstr "Merkistön uudelleenkoodaus:" #: libraries/display_import.lib.php:66 msgid "" @@ -5819,28 +5798,26 @@ msgstr "" "saatavilla." #: libraries/display_import.lib.php:129 -#, fuzzy #| msgid "Cannot log in to the MySQL server" msgid "Importing into the current server" -msgstr "MySQL-palvelimelle ei voitu kirjautua" +msgstr "Tuonti nykyiselle palvalimelle" #: libraries/display_import.lib.php:131 -#, fuzzy, php-format +#, php-format #| msgid "Go to database" msgid "Importing into the database \"%s\"" -msgstr "Siirry tietokantaan" +msgstr "Tuonti tietokantaan \"%s\"" #: libraries/display_import.lib.php:133 -#, fuzzy, php-format +#, php-format #| msgid "Go to database" msgid "Importing into the table \"%s\"" -msgstr "Siirry tietokantaan" +msgstr "Tuonti tauluun \"%s\"" #: libraries/display_import.lib.php:139 -#, fuzzy #| msgid "File to import" msgid "File to Import:" -msgstr "Tuotava tiedosto" +msgstr "Tuotava tiedosto:" #: libraries/display_import.lib.php:156 #, php-format @@ -5858,10 +5835,9 @@ msgid "File uploads are not allowed on this server." msgstr "Tällä palvelimella ei ole sallittu tiedostojen lähetystä." #: libraries/display_import.lib.php:208 -#, fuzzy #| msgid "Partial import" msgid "Partial Import:" -msgstr "Osittainen tuonti" +msgstr "Osittainen tuonti:" #: libraries/display_import.lib.php:214 #, php-format @@ -5872,7 +5848,6 @@ msgstr "" "uudestaan, jatkamme kohdasta %d." #: libraries/display_import.lib.php:221 -#, fuzzy #| msgid "" #| "the interruption of an import in case the script detects it is se to the " #| "timeout limit. This might be good way to import large es, however it " @@ -5882,15 +5857,14 @@ msgid "" "to the PHP timeout limit. (This might be good way to import large files, " "however it can break transactions.)" msgstr "" -"Anna tuonnin keskeytyä, mikäli skripti huomaa ylittävänsä aikarajoituksen. " -"Tätä kannattaa käyttää tuotaessa suuria tiedostoja; se voi kuitenkin " -"aiheuttaa häiriöitä transaktioihin." +"Mahdollistaa tuonnin keskeytyksen, mikäli skripti päättyy PHP:n " +"aikarajoituksen. (Tätä kannattaa käyttää tuotaessa suuria tiedostoja, se " +"voi kuitenkin aiheuttaa häiriöitä transaktioihin.)" #: libraries/display_import.lib.php:228 -#, fuzzy #| msgid "Number of records (queries) to skip from start" msgid "Number of rows to skip, starting from the first row:" -msgstr "Alusta ohitettavien tietueiden (kyselyjen) määrä" +msgstr "Ohitettavien rivien määrä, aloitus ensimmäisestä rivistä:" #: libraries/display_import.lib.php:250 msgid "Format-Specific Options:" @@ -5902,34 +5876,29 @@ msgid "Language" msgstr "Kieli" #: libraries/display_tbl.lib.php:406 -#, fuzzy #| msgid "Save directory" msgid "Save edited data" -msgstr "Tallennushakemisto" +msgstr "Tallenna muokatut tiedot" #: libraries/display_tbl.lib.php:412 -#, fuzzy #| msgid "CHAR textarea columns" msgid "Restore column order" -msgstr "CHAR-tekstikentän sarakkeet" +msgstr "Palauta sarakkeiden järjestys" #: libraries/display_tbl.lib.php:428 -#, fuzzy #| msgid "Start" msgid "Start row" -msgstr "Käynnistä" +msgstr "Aloitusrivi" #: libraries/display_tbl.lib.php:430 -#, fuzzy #| msgid "Number of fields" msgid "Number of rows" -msgstr "Kenttien määrä" +msgstr "Rivien määrä" #: libraries/display_tbl.lib.php:435 -#, fuzzy #| msgid "More" msgid "Mode" -msgstr "Lisää" +msgstr "Tila" #: libraries/display_tbl.lib.php:437 msgid "horizontal" @@ -5946,7 +5915,7 @@ msgstr "pystysuorassa" #: libraries/display_tbl.lib.php:445 #, php-format msgid "Headers every %s rows" -msgstr "" +msgstr "Otsikot joka %s rivi" #: libraries/display_tbl.lib.php:548 msgid "Sort by key" @@ -5970,13 +5939,11 @@ msgid "Options" msgstr "Valinnat" #: libraries/display_tbl.lib.php:632 libraries/display_tbl.lib.php:650 -#, fuzzy #| msgid "Partial Texts" msgid "Partial texts" -msgstr "Lyhennetyt tekstit" +msgstr "Osittaiset tekstit" #: libraries/display_tbl.lib.php:633 libraries/display_tbl.lib.php:654 -#, fuzzy #| msgid "Full Texts" msgid "Full texts" msgstr "Koko tekstit" @@ -6000,10 +5967,9 @@ msgid "Show BLOB contents" msgstr "Näytä BLOB-sisältö" #: libraries/display_tbl.lib.php:687 -#, fuzzy #| msgid "Browser transformation" msgid "Hide browser transformation" -msgstr "Selaimen muunnos (transformation)" +msgstr "piilota webselaimen muunnos" #: libraries/display_tbl.lib.php:694 msgid "Well Known Text" @@ -6247,20 +6213,16 @@ msgstr "" "kyselyllä tai luotaessa indeksejä CREATE INDEX- tai ALTER TABLE -kyselyillä." #: libraries/engines/pbms.lib.php:30 -#, fuzzy #| msgid "Garbage threshold" msgid "Garbage Threshold" -msgstr "Roskankeruun kynnysarvo" +msgstr "Roskankeruun alaraja" #: libraries/engines/pbms.lib.php:31 -#, fuzzy #| msgid "" #| "rcentage of garbage in a data log file before it is compacted. This a ue " #| "between 1 and 99. The default is 50." msgid "The percentage of garbage in a repository file before it is compacted." -msgstr "" -"Tietolokitiedoston roskatietojen prosentuaalinen määrä ennen kuin tiedostoa " -"tiivistetään. Tämän arvon on oltava väliltä 1 - 99. Oletusarvo on 50." +msgstr "Roskatietojen prosentuaalinen määrä ennen kuin tiedostoa tiivistetään." #: libraries/engines/pbms.lib.php:35 libraries/replication_gui.lib.php:70 #: server_synchronize.php:1261 @@ -6295,10 +6257,9 @@ msgid "" msgstr "" #: libraries/engines/pbms.lib.php:50 -#, fuzzy #| msgid "Log file threshold" msgid "Temp Log Threshold" -msgstr "Lokitiedoston kynnysarvo" +msgstr "Väliaikaislokin alaraja" #: libraries/engines/pbms.lib.php:51 msgid "" @@ -6335,10 +6296,9 @@ msgid "" msgstr "" #: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127 -#, fuzzy #| msgid "Relations" msgid "Related Links" -msgstr "Relaatiot" +msgstr "Riippuvuudet" #: libraries/engines/pbms.lib.php:98 msgid "The PrimeBase Media Streaming Blog by Barry Leslie" @@ -6512,10 +6472,9 @@ msgid "The PrimeBase Media Streaming (PBMS) home page" msgstr "" #: libraries/export/csv.php:24 libraries/import/csv.php:28 -#, fuzzy #| msgid "Lines terminated by" msgid "Columns separated with:" -msgstr "Rivien erotinmerkki" +msgstr "Sarakkeiden erotin:" #: libraries/export/csv.php:25 libraries/import/csv.php:29 #, fuzzy @@ -6530,38 +6489,33 @@ msgid "Columns escaped with:" msgstr "Koodinvaihtomerkki" #: libraries/export/csv.php:27 libraries/import/csv.php:31 -#, fuzzy #| msgid "Lines terminated by" msgid "Lines terminated with:" -msgstr "Rivien erotinmerkki" +msgstr "Rivien lopetusmerkki:" #: libraries/export/csv.php:28 libraries/export/excel.php:23 #: libraries/export/htmlword.php:29 libraries/export/latex.php:80 #: libraries/export/ods.php:24 libraries/export/odt.php:60 -#, fuzzy #| msgid "Replace NULL by" msgid "Replace NULL with:" -msgstr "Korvaa NULL-merkki tällä:" +msgstr "Korvaa NULL-merkki:" #: libraries/export/csv.php:29 libraries/export/excel.php:24 -#, fuzzy #| msgid "Remove CRLF characters within fields" msgid "Remove carriage return/line feed characters within columns" -msgstr "Poista kentistä CRLF-merkit" +msgstr "Poista sarakkeista CR/LF-merkit" #: libraries/export/excel.php:33 -#, fuzzy #| msgid "Excel edition" msgid "Excel edition:" -msgstr "Excel-muokkaus" +msgstr "Excel-muotoilu:" #: libraries/export/htmlword.php:28 libraries/export/latex.php:70 #: libraries/export/odt.php:56 libraries/export/sql.php:222 #: libraries/export/texytext.php:26 libraries/export/xml.php:73 -#, fuzzy #| msgid "Databases display options" msgid "Data dump options" -msgstr "Tietokantojen näyttöasetukset" +msgstr "Tiedon vedostusasetukset" #: libraries/export/htmlword.php:121 libraries/export/odt.php:173 #: libraries/export/sql.php:1188 libraries/export/texytext.php:109 @@ -6574,46 +6528,40 @@ msgid "Table structure for table" msgstr "Rakenne taululle" #: libraries/export/latex.php:14 -#, fuzzy #| msgid "Content of table __TABLE__" msgid "Content of table @TABLE@" -msgstr "Taulun __TABLE__ sisältö" +msgstr "Taulun @TABLE@ sisältö" #: libraries/export/latex.php:15 msgid "(continued)" msgstr "(jatkuu)" #: libraries/export/latex.php:16 -#, fuzzy #| msgid "Structure of table __TABLE__" msgid "Structure of table @TABLE@" -msgstr "Taulun __TABLE__ rakenne" +msgstr "Taulun @TABLE@ rakenne" #: libraries/export/latex.php:48 libraries/export/odt.php:40 #: libraries/export/sql.php:142 -#, fuzzy #| msgid "Transformation options" msgid "Object creation options" -msgstr "Muunnosvaihtoehdot" +msgstr "Objektin luontivaihtoehdot" #: libraries/export/latex.php:52 libraries/export/latex.php:76 -#, fuzzy #| msgid "Table caption" msgid "Table caption (continued)" -msgstr "Taulun otsikko" +msgstr "Taulun otsikko (jatkuu)" #: libraries/export/latex.php:57 libraries/export/odt.php:43 #: libraries/export/sql.php:56 -#, fuzzy #| msgid "Disable foreign key checks" msgid "Display foreign key relationships" -msgstr "Älä tarkista viiteavaimia" +msgstr "Näytä viiteavaimien suhteet" #: libraries/export/latex.php:60 libraries/export/odt.php:46 -#, fuzzy #| msgid "Displaying Column Comments" msgid "Display comments" -msgstr "Sarakkeiden kommentit näkyvissä" +msgstr "Näytä kommentit" #: libraries/export/latex.php:63 libraries/export/odt.php:49 #: libraries/export/sql.php:63 @@ -6673,10 +6621,9 @@ msgid "" msgstr "" #: libraries/export/sql.php:45 -#, fuzzy #| msgid "Add custom comment into header (\\n splits lines)" msgid "Additional custom header comment (\\n splits lines):" -msgstr "Lisää oma kommentti otsikkoon (\\n on rivinvaihto)" +msgstr "Lisää oma kommentti otsikkoon (\\n on rivinvaihto):" #: libraries/export/sql.php:50 msgid "" @@ -6691,16 +6638,15 @@ msgstr "" #: libraries/export/sql.php:114 libraries/export/sql.php:173 #: libraries/export/sql.php:180 -#, fuzzy, php-format +#, php-format #| msgid "Statements" msgid "Add %s statement" -msgstr "Tieto" +msgstr "Lisää %s lauseke" #: libraries/export/sql.php:152 -#, fuzzy #| msgid "Statements" msgid "Add statements:" -msgstr "Tieto" +msgstr "Lisää lausekkeet:" #: libraries/export/sql.php:211 msgid "" @@ -6813,10 +6759,9 @@ msgid "Object creation options (all are recommended)" msgstr "" #: libraries/export/xml.php:62 -#, fuzzy #| msgid "View" msgid "Views" -msgstr "Näkymä" +msgstr "Näkymät" #: libraries/export/xml.php:78 msgid "Export contents" @@ -6828,10 +6773,9 @@ msgid "Open new phpMyAdmin window" msgstr "Avaa uusi phpMyAdmin-ikkuna" #: libraries/gis_visualization.lib.php:134 -#, fuzzy #| msgid "No data found for the chart." msgid "No data found for GIS visualization." -msgstr "Kaaviolle ei ole tietoja." +msgstr "GIS visualisoinnille ei ole tietoja." #: libraries/header_http.inc.php:15 libraries/header_meta_style.inc.php:15 msgid "GLOBALS overwrite attempt" @@ -7561,10 +7505,9 @@ msgstr "Loppu" #: libraries/rte/rte_events.lib.php:465 libraries/rte/rte_routines.lib.php:923 #: libraries/rte/rte_triggers.lib.php:354 -#, fuzzy #| msgid "Description" msgid "Definition" -msgstr "Kuvaus" +msgstr "Määritys" #: libraries/rte/rte_events.lib.php:471 #, fuzzy @@ -8421,16 +8364,14 @@ msgid "Operator" msgstr "Operaattori" #: libraries/tbl_select.lib.php:103 -#, fuzzy #| msgid "Search" msgid "Table Search" -msgstr "Etsi" +msgstr "Taulu haku" #: libraries/tbl_select.lib.php:175 tbl_change.php:1000 -#, fuzzy #| msgid "Insert" msgid "Edit/Insert" -msgstr "Lisää rivi" +msgstr "Muokkaa/lisää" #: libraries/transformations.lib.php:134 #, php-format @@ -12051,7 +11992,6 @@ msgid "Do a \"query by example\" (wildcard: \"%\")" msgstr "Suorita mallin mukainen kysely (jokerimerkki: \"%\")" #: tbl_select.php:178 -#, fuzzy #| msgid "Select fields (at least one):" msgid "Select columns (at least one):" msgstr "Valitse sarakkeet (vähintään yksi):" @@ -12327,42 +12267,38 @@ msgid "Create version" msgstr "Luo versio" #: tbl_zoom_select.php:142 -#, fuzzy #| msgid "Do a \"query by example\" (wildcard: \"%\")" msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns" -msgstr "Suorita mallin mukainen kysely (jokerimerkki: \"%\")" +msgstr "" +"Suorita mallin mukainen kysely (jokerimerkki: \"%\") kahteen eri sarakkeeseen" #: tbl_zoom_select.php:152 -#, fuzzy #| msgid "Hide search criteria" msgid "Additional search criteria" -msgstr "Piilota hakusanat" +msgstr "Tarkempi haku" #: tbl_zoom_select.php:283 msgid "Use this column to label each point" msgstr "" #: tbl_zoom_select.php:303 -#, fuzzy #| msgid "Maximum number of rows to display" msgid "Maximum rows to plot" -msgstr "Näytettävien rivien enimmäismäärä" +msgstr "Tulostettavien rivien enimmäismäärä" #: tbl_zoom_select.php:417 msgid "Browse/Edit the points" msgstr "" #: tbl_zoom_select.php:424 -#, fuzzy #| msgid "Control user" msgid "How to use" -msgstr "Hallintakäyttäjä" +msgstr "Kuinka käytetään" #: tbl_zoom_select.php:431 -#, fuzzy #| msgid "Reset" msgid "Reset zoom" -msgstr "Palauta" +msgstr "Palauta zoomaus" #: themes.php:28 msgid "Get more themes!" From b011120ccaba0c2c9825589cb641690343f92a5b Mon Sep 17 00:00:00 2001 From: "J. M" Date: Mon, 25 Jun 2012 07:59:40 +0200 Subject: [PATCH 07/24] Translated using Weblate. --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index ffd9722acd..7c8304fb74 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 3.5.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-04 13:42+0200\n" -"PO-Revision-Date: 2012-06-06 19:43+0200\n" +"PO-Revision-Date: 2012-06-24 16:15+0200\n" "Last-Translator: J. M. \n" "Language-Team: none\n" "Language: de\n" @@ -1165,7 +1165,7 @@ msgstr "Die ausgewählten Benutzer werden gelöscht" #: js/messages.php:62 js/messages.php:141 tbl_tracking.php:235 #: tbl_tracking.php:415 msgid "Close" -msgstr "Schliessen" +msgstr "Schließen" #: js/messages.php:65 js/messages.php:284 libraries/Index.class.php:468 #: libraries/common.lib.php:648 libraries/common.lib.php:1197 From 65874477169d72fa5f98da45c8905c3d0d76bed5 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 25 Jun 2012 07:59:41 +0200 Subject: [PATCH 08/24] Translated using Weblate. --- po/si.po | 47 ++++++++++++++++++----------------------------- 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/po/si.po b/po/si.po index aa89491c5b..228288768f 100644 --- a/po/si.po +++ b/po/si.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-04 13:42+0200\n" -"PO-Revision-Date: 2012-05-07 10:57+0200\n" +"PO-Revision-Date: 2012-06-24 15:11+0200\n" "Last-Translator: Madhura Jayaratne \n" "Language-Team: sinhala \n" "Language: si\n" @@ -12,7 +12,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 0.10\n" +"X-Generator: Weblate 1.0\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353 #: libraries/display_tbl.lib.php:359 server_privileges.php:1677 @@ -1891,7 +1891,7 @@ msgstr "ලක්ෂ්‍යයක් මතින් ගමන් කරන #: js/messages.php:304 msgid "To zoom in, select a section of the plot with the mouse." -msgstr "" +msgstr "තුළු සූමකරණය සඳහා ප්‍රස්ථාරයේ කොටසක් මූසිකය ආධාරයෙන් තෝරන්න." #: js/messages.php:306 msgid "Click reset zoom link to come back to original state." @@ -5674,9 +5674,8 @@ msgstr "" "තෝරාගත් ආකෘතිය සඳහා විකල්ප භාවිතා කිරීමට පහලට යන්න. අනෙකුත් ආකෘති සඳහා විකල්ප නොසලකන්න." #: libraries/display_export.lib.php:342 libraries/display_import.lib.php:260 -#, fuzzy msgid "Encoding Conversion:" -msgstr "MySQL සේවාදායකයාගේ සංස්කරණය" +msgstr "කේතීකරණ පරිවර්තනය:" #: libraries/display_import.lib.php:66 msgid "" @@ -7933,7 +7932,7 @@ msgstr "" #: libraries/tbl_links.inc.php:118 libraries/tbl_links.inc.php:119 msgid "Table seems to be empty!" -msgstr "" +msgstr "වගුව හිස් ය!" #: libraries/tbl_links.inc.php:126 #, php-format @@ -9821,18 +9820,12 @@ msgid "The amount of data written so far, in bytes." msgstr "මේ දක්වා ලියැවුණු දත්ත ප්‍රමාණය, බයිට වලින්." #: server_status.php:1350 -#, fuzzy msgid "The number of pages that have been written for doublewrite operations." -msgstr "" -"The number of doublewrite writes that have been performed and the number of " -"pages that have been written for this purpose." +msgstr "ද්විත්ව-ලිවීම් මෙහෙයුම් සඳහා ලියැවුණු පිටු ගණන." #: server_status.php:1351 -#, fuzzy msgid "The number of doublewrite operations that have been performed." -msgstr "" -"The number of doublewrite writes that have been performed and the number of " -"pages that have been written for this purpose." +msgstr "සිදු කෙරුණු ද්විත්ව-ලිවීම් මෙහෙයුම් ගණන." #: server_status.php:1352 msgid "" @@ -11460,10 +11453,9 @@ msgid "How to use" msgstr "භාවිතා කරන අයුරු" #: tbl_zoom_select.php:431 -#, fuzzy #| msgid "Reset" msgid "Reset zoom" -msgstr "ප්‍රතිසකසන්න" +msgstr "සූමය ප්‍රතිසකසන්න" #: themes.php:28 msgid "Get more themes!" @@ -11523,10 +11515,9 @@ msgid "The uptime is only %s" msgstr "" #: po/advisory_rules.php:10 -#, fuzzy #| msgid "Versions" msgid "Questions below 1,000" -msgstr "අනුවාද" +msgstr "ප්‍රශ්න ගණන 1,000 ට වඩා අඩුය" #: po/advisory_rules.php:11 msgid "" @@ -11541,10 +11532,10 @@ msgid "" msgstr "" #: po/advisory_rules.php:13 -#, fuzzy, php-format +#, php-format #| msgid "Current connection" msgid "Current amount of Questions: %s" -msgstr "වත්මන් සම්බන්දතාව" +msgstr "වත්මන් ප්‍රශ්න ගණන: %s" #: po/advisory_rules.php:15 msgid "Percentage of slow queries" @@ -11601,7 +11592,7 @@ msgstr "" #: po/advisory_rules.php:28 #, php-format msgid "long_query_time is currently set to %ds." -msgstr "" +msgstr "long_query_time තත්පර %d කට සිටුවා ඇත." #: po/advisory_rules.php:30 msgid "Slow query logging" @@ -11609,7 +11600,7 @@ msgstr "මන්දගාමී විමසුම් ලොගගත කිර #: po/advisory_rules.php:31 msgid "The slow query log is disabled." -msgstr "" +msgstr "වැඩි කාලයක් ගන්න විමසුම් සටහන් කරනා ලොගය අක්‍රීය යි." #: po/advisory_rules.php:32 msgid "" @@ -11619,7 +11610,7 @@ msgstr "" #: po/advisory_rules.php:33 msgid "log_slow_queries is set to 'OFF'" -msgstr "" +msgstr "log_slow_queries, 'OFF'(අක්‍රීය) වෙත පිහිටුවා ඇත" #: po/advisory_rules.php:35 #, fuzzy @@ -11661,10 +11652,9 @@ msgid "Version less than 5.5.8 (the first GA release of 5.5)." msgstr "" #: po/advisory_rules.php:47 -#, fuzzy #| msgid "You should upgrade to %s %s or later." msgid "You should upgrade, to a stable version of MySQL 5.5" -msgstr "You should upgrade to %s %s or later." +msgstr "ඔබ MySQL 5.5 හි ස්ථාවර අනුවාදයක් වෙත යාවත්කාලීන කල යුතුය" #: po/advisory_rules.php:50 po/advisory_rules.php:55 po/advisory_rules.php:60 msgid "Distribution" @@ -11707,10 +11697,9 @@ msgid "Version string (%s) matches Drizzle versioning scheme" msgstr "" #: po/advisory_rules.php:65 -#, fuzzy #| msgid "MySQL charset" msgid "MySQL Architecture" -msgstr "MySQL අක්ෂර කට්ටලය" +msgstr "MySQL නිර්මිතය" #: po/advisory_rules.php:66 msgid "MySQL is not compiled as a 64-bit package." @@ -11754,7 +11743,7 @@ msgstr "විමසුම් කෑෂ්ගත කරන ක්‍රමය" #: po/advisory_rules.php:76 msgid "Suboptimal caching method." -msgstr "" +msgstr "කෑෂ්ගත කරන ක්‍රමය ප්‍රශස්ත නැත." #: po/advisory_rules.php:77 msgid "" @@ -11884,7 +11873,7 @@ msgstr "" #: po/advisory_rules.php:103 #, php-format msgid "Current query cache size: %s" -msgstr "" +msgstr "වත්මන් විමසුම් කෑෂයේ ප්‍රමාණය: %s" #: po/advisory_rules.php:105 msgid "Query cache min result size" From c3f83cb7b1384b6d807510281612ed76f568a12d Mon Sep 17 00:00:00 2001 From: "J. M" Date: Mon, 25 Jun 2012 07:59:53 +0200 Subject: [PATCH 09/24] Translated using Weblate. --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 3a282691c5..8771c08a0d 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-18 10:54+0200\n" -"PO-Revision-Date: 2012-06-06 19:43+0200\n" +"PO-Revision-Date: 2012-06-24 16:15+0200\n" "Last-Translator: J. M. \n" "Language-Team: none\n" "Language: de\n" @@ -1122,7 +1122,7 @@ msgstr "Die ausgewählten Benutzer werden gelöscht" #: js/messages.php:58 js/messages.php:137 tbl_tracking.php:281 #: tbl_tracking.php:473 msgid "Close" -msgstr "Schliessen" +msgstr "Schließen" #: js/messages.php:61 js/messages.php:284 #: libraries/DisplayResults.class.php:2547 libraries/Index.class.php:485 From 3bd1600ba964ca84880f6a8e56a310b60981af55 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 25 Jun 2012 07:59:55 +0200 Subject: [PATCH 10/24] Translated using Weblate. --- po/si.po | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/po/si.po b/po/si.po index e7ea64d3c3..35e9edd24c 100644 --- a/po/si.po +++ b/po/si.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-06-18 10:54+0200\n" -"PO-Revision-Date: 2012-06-24 12:42+0200\n" +"PO-Revision-Date: 2012-06-24 15:15+0200\n" "Last-Translator: Madhura Jayaratne \n" "Language-Team: sinhala \n" "Language: si\n" @@ -1871,11 +1871,11 @@ msgstr "ලක්ෂ්‍යයක් මතින් ගමන් කරන #: js/messages.php:304 msgid "To zoom in, select a section of the plot with the mouse." -msgstr "" +msgstr "තුළු සූමකරණය සඳහා ප්‍රස්ථාරයේ කොටසක් මූසිකය ආධාරයෙන් තෝරන්න." #: js/messages.php:306 msgid "Click reset zoom button to come back to original state." -msgstr "" +msgstr "පෙර තත්ත්වයට පැමිණීම සඳහා සූමකරණය ප්‍රතිසකසන බොත්තම ක්ලික් කරන්න." #: js/messages.php:308 msgid "Click a data point to view and possibly edit the data row." @@ -2323,6 +2323,8 @@ msgstr "'%s' රීතිය සඳහා පෙළ සැකසීම අසම msgid "" "Invalid rule declaration on line %1$s, expected line %2$s of previous rule" msgstr "" +"%1$s පේළියේ වැරදි රීති අර්ථ දැක්වීමකි, පෙර රීතියේ %2$s වන පේළිය බලාපොරොත්තු " +"විය" #: libraries/Advisor.class.php:378 #, php-format @@ -2333,12 +2335,12 @@ msgstr "%s වන පේළියේ වැරදි රීති අර්ථ #: libraries/Advisor.class.php:386 #, php-format msgid "Unexpected characters on line %s" -msgstr "" +msgstr "%s වන පේළියේ අනපේක්ෂිත අනුලකුණකි" #: libraries/Advisor.class.php:400 #, php-format msgid "Unexpected character on line %1$s. Expected tab, but found \"%2$s\"" -msgstr "" +msgstr "%1$s වන පේළියේ අනපේක්ෂිත අනුලකුණකි. ටැබයක් අපේක්ෂිත නමුත් \"%2$s\" හමුවිය" #: libraries/Advisor.class.php:425 server_status.php:958 msgid "per second" @@ -2727,7 +2729,7 @@ msgstr "ප්‍රේරක" #: libraries/Menu.class.php:316 libraries/Menu.class.php:317 msgid "Table seems to be empty!" -msgstr "" +msgstr "වගුව හිස් ය!" #: libraries/Menu.class.php:344 libraries/Menu.class.php:345 #: libraries/Menu.class.php:346 @@ -3279,7 +3281,7 @@ msgstr "ඕනෑම වර්ගයක ජ්‍යාමිතීන් එක #: libraries/Types.class.php:623 libraries/Types.class.php:973 msgctxt "numeric types" msgid "Numeric" -msgstr "" +msgstr "සංඛ්‍යාත්මක" #: libraries/Types.class.php:642 libraries/Types.class.php:976 #| msgid "Create an index" @@ -3388,7 +3390,7 @@ msgstr "mcrypt හි Blowfish භාවිතා කිරීම අසමත #: libraries/auth/cookie.auth.lib.php:139 msgid "Your session has expired. Please login again." -msgstr "" +msgstr "ඔබගේ සැසිය කල් ඉකුත් වී ඇත. නැවත ඇතුළු වන්න." #: libraries/auth/cookie.auth.lib.php:227 msgid "Log in" From 16c0d46f090fd68138a97665de43acaec4c98928 Mon Sep 17 00:00:00 2001 From: Gyu-sun Youm Date: Mon, 25 Jun 2012 11:04:20 +0200 Subject: [PATCH 11/24] Translated using Weblate. --- po/ko.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ko.po b/po/ko.po index 441b379581..47aa908c2d 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-18 10:54+0200\n" -"PO-Revision-Date: 2012-06-22 04:47+0200\n" -"Last-Translator: Hyun-Sung Yun \n" +"PO-Revision-Date: 2012-06-25 10:59+0200\n" +"Last-Translator: Gyu-sun Youm \n" "Language-Team: korean \n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -108,7 +108,7 @@ msgstr "데이터베이스 %1$s가 생성되었습니다." #: db_datadict.php:49 db_operations.php:407 msgid "Database comment: " -msgstr "데이터베이스 설명:" +msgstr "데이터베이스 설명: " #: db_datadict.php:154 libraries/schema/Pdf_Relation_Schema.class.php:1317 #: libraries/tbl_properties.inc.php:814 tbl_operations.php:375 @@ -207,7 +207,7 @@ msgstr "설명" #: tbl_structure.php:346 tbl_tracking.php:327 tbl_tracking.php:382 #: tbl_tracking.php:387 msgid "No" -msgstr "아니오 " +msgstr "아니오" #: db_datadict.php:235 js/messages.php:250 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/Index.class.php:704 From 0268a0b7c966feae059a2f8731f30576c0ca110e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 25 Jun 2012 11:09:11 +0200 Subject: [PATCH 12/24] Include vendor config before scripts which use it --- test/libraries/core/PMA_fatalError_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/libraries/core/PMA_fatalError_test.php b/test/libraries/core/PMA_fatalError_test.php index dc4777f15d..2ae27c40f7 100644 --- a/test/libraries/core/PMA_fatalError_test.php +++ b/test/libraries/core/PMA_fatalError_test.php @@ -12,11 +12,11 @@ /* * Include to test. */ +require_once 'libraries/vendor_config.php'; require_once 'libraries/select_lang.lib.php'; require_once 'libraries/core.lib.php'; require_once 'libraries/sanitizing.lib.php'; require_once 'libraries/Config.class.php'; -require_once 'libraries/vendor_config.php'; require_once 'libraries/php-gettext/gettext.inc'; class PMA_fatalError_test extends PHPUnit_Framework_TestCase @@ -42,4 +42,4 @@ class PMA_fatalError_test extends PHPUnit_Framework_TestCase PMA_fatalError($message, $params); } -} \ No newline at end of file +} From 913dd208a02770b7066f621af770ae5b8d013a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 25 Jun 2012 11:10:22 +0200 Subject: [PATCH 13/24] Include core before libraries which use it --- test/libraries/core/PMA_fatalError_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/libraries/core/PMA_fatalError_test.php b/test/libraries/core/PMA_fatalError_test.php index 2ae27c40f7..6b20894d20 100644 --- a/test/libraries/core/PMA_fatalError_test.php +++ b/test/libraries/core/PMA_fatalError_test.php @@ -13,8 +13,8 @@ * Include to test. */ require_once 'libraries/vendor_config.php'; -require_once 'libraries/select_lang.lib.php'; require_once 'libraries/core.lib.php'; +require_once 'libraries/select_lang.lib.php'; require_once 'libraries/sanitizing.lib.php'; require_once 'libraries/Config.class.php'; require_once 'libraries/php-gettext/gettext.inc'; From f010626290f9e70d64ea401dca93b1d0511c9724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 25 Jun 2012 11:10:40 +0200 Subject: [PATCH 14/24] Use require_once because of testsuite --- libraries/Config.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index cad6eff80b..01d47aa670 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -12,7 +12,7 @@ if (! defined('PHPMYADMIN')) { /** * Load vendor configuration. */ -require './libraries/vendor_config.php'; +require_once './libraries/vendor_config.php'; /** * Configuration class From 14d2a27b8f11d20e4518f8658098cd2618a59d53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 25 Jun 2012 11:13:01 +0200 Subject: [PATCH 15/24] Prepare config as test uses it --- test/libraries/core/PMA_fatalError_test.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/libraries/core/PMA_fatalError_test.php b/test/libraries/core/PMA_fatalError_test.php index 6b20894d20..fdf6e6ab93 100644 --- a/test/libraries/core/PMA_fatalError_test.php +++ b/test/libraries/core/PMA_fatalError_test.php @@ -21,6 +21,12 @@ require_once 'libraries/php-gettext/gettext.inc'; class PMA_fatalError_test extends PHPUnit_Framework_TestCase { + public function setup() + { + $GLOBALS['PMA_Config'] = new PMA_Config(); + $GLOBALS['PMA_Config']->enableBc(); + } + public function testFatalErrorMessage() { $this->expectOutputRegex("/FatalError!/"); From ad824a9232451659675a78a27d2dcde5c91e1f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 25 Jun 2012 12:16:51 +0200 Subject: [PATCH 16/24] The sql_query can be unset --- libraries/Footer.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/Footer.class.php b/libraries/Footer.class.php index 7ba4069615..fa264996b9 100644 --- a/libraries/Footer.class.php +++ b/libraries/Footer.class.php @@ -106,7 +106,7 @@ class PMA_Footer // set current db, table and sql query in the querywindow $query = ''; - if (strlen($GLOBALS['sql_query']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { + if (isset($GLOBALS['sql_query']) && strlen($GLOBALS['sql_query']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { $query = PMA_escapeJsString($GLOBALS['sql_query']); } $this->_scripts->addCode(" From 6a4ac7ef32d152cab1299debf46ed359f2c0d615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 25 Jun 2012 12:17:12 +0200 Subject: [PATCH 17/24] Do not emit headers when running testsuite --- libraries/Header.class.php | 4 ++-- libraries/OutputBuffering.class.php | 8 +++++--- libraries/core.lib.php | 3 +++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libraries/Header.class.php b/libraries/Header.class.php index ddad908901..d61dda9fa2 100644 --- a/libraries/Header.class.php +++ b/libraries/Header.class.php @@ -335,7 +335,7 @@ class PMA_Header */ $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT'; /* Prevent against ClickJacking by allowing frames only from same origin */ - if (! $GLOBALS['cfg']['AllowThirdPartyFraming']) { + if (! $GLOBALS['cfg']['AllowThirdPartyFraming'] && ! defined('TESTSUITE')) { header( 'X-Frame-Options: SAMEORIGIN' ); @@ -351,7 +351,7 @@ class PMA_Header ); } PMA_noCacheHeader(); - if (! defined('IS_TRANSFORMATION_WRAPPER')) { + if (! defined('IS_TRANSFORMATION_WRAPPER') && ! defined('TESTSUITE')) { // Define the charset to be used header('Content-Type: text/html; charset=utf-8'); } diff --git a/libraries/OutputBuffering.class.php b/libraries/OutputBuffering.class.php index 782e7d0686..69e12aeb9c 100644 --- a/libraries/OutputBuffering.class.php +++ b/libraries/OutputBuffering.class.php @@ -1,7 +1,7 @@ _mode); + if (! defined('TESTSUITE')) { + header('X-ob_mode: ' . $this->_mode); + } register_shutdown_function('PMA_OutputBuffering::stop'); $this->_on = true; } diff --git a/libraries/core.lib.php b/libraries/core.lib.php index b83614cccb..790523ecc8 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -575,6 +575,9 @@ function PMA_sendHeaderLocation($uri, $use_refresh = false) */ function PMA_noCacheHeader() { + if (defined('TESTSUITE')) { + return; + } // rfc2616 - Section 14.21 header('Expires: ' . date(DATE_RFC1123)); // HTTP/1.1 From cacbc79bc8f07841c015d68eac37aefe8456a35a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 25 Jun 2012 12:17:50 +0200 Subject: [PATCH 18/24] Add missing variables and includes to make the test work --- test/libraries/core/PMA_fatalError_test.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/libraries/core/PMA_fatalError_test.php b/test/libraries/core/PMA_fatalError_test.php index fdf6e6ab93..d50ec533f7 100644 --- a/test/libraries/core/PMA_fatalError_test.php +++ b/test/libraries/core/PMA_fatalError_test.php @@ -14,9 +14,14 @@ */ require_once 'libraries/vendor_config.php'; require_once 'libraries/core.lib.php'; +require_once 'libraries/common.lib.php'; +require_once 'libraries/js_escape.lib.php'; require_once 'libraries/select_lang.lib.php'; require_once 'libraries/sanitizing.lib.php'; require_once 'libraries/Config.class.php'; +require_once 'libraries/url_generating.lib.php'; +require_once 'libraries/Theme.class.php'; +require_once 'libraries/Table.class.php'; require_once 'libraries/php-gettext/gettext.inc'; class PMA_fatalError_test extends PHPUnit_Framework_TestCase @@ -25,6 +30,18 @@ class PMA_fatalError_test extends PHPUnit_Framework_TestCase { $GLOBALS['PMA_Config'] = new PMA_Config(); $GLOBALS['PMA_Config']->enableBc(); + $GLOBALS['cfg']['Server'] = array( + 'host' => 'host', + 'verbose' => 'verbose', + ); + $GLOBALS['cfg']['OBGzip'] = false; + $_SESSION['PMA_Theme'] = new PMA_Theme(); + $_SESSION[' PMA_token '] = 'token'; + $GLOBALS['pmaThemeImage'] = 'theme/'; + $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath(); + $GLOBALS['server'] = 1; + $GLOBALS['db'] = ''; + $GLOBALS['table'] = ''; } public function testFatalErrorMessage() From be434a8b057fddf6d6ab46cb5bc4b70766171e55 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 25 Jun 2012 07:52:19 -0400 Subject: [PATCH 19/24] The new "check all" checkbox should not be used to find a database name for dropping purposes --- js/server_databases.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/server_databases.js b/js/server_databases.js index abf31b2caf..caf59554b4 100644 --- a/js/server_databases.js +++ b/js/server_databases.js @@ -30,7 +30,8 @@ $(function() { * @var selected_dbs Array containing the names of the checked databases */ var selected_dbs = []; - $form.find('input:checkbox:checked').each(function () { + // loop over all checked checkboxes, except the #checkall checkbox + $form.find('input:checkbox:checked:not(#checkall)').each(function () { $(this).closest('tr').addClass('removeMe'); selected_dbs[selected_dbs.length] = 'DROP DATABASE `' + escapeHtml($(this).val()) + '`;'; }); From b9c97929eca41f476b7345b36ae129b36d7d819a Mon Sep 17 00:00:00 2001 From: Gyu-sun Youm Date: Mon, 25 Jun 2012 14:37:27 +0200 Subject: [PATCH 20/24] Translated using Weblate. --- po/ko.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ko.po b/po/ko.po index 8ba57acd63..bc65c3d378 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-04 13:42+0200\n" -"PO-Revision-Date: 2012-06-22 04:47+0200\n" -"Last-Translator: Hyun-Sung Yun \n" +"PO-Revision-Date: 2012-06-25 10:59+0200\n" +"Last-Translator: Gyu-sun Youm \n" "Language-Team: korean \n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -126,7 +126,7 @@ msgstr "데이터베이스 %1$s가 생성되었습니다." #: db_datadict.php:49 db_operations.php:370 msgid "Database comment: " -msgstr "데이터베이스 설명:" +msgstr "데이터베이스 설명: " #: db_datadict.php:153 libraries/schema/Pdf_Relation_Schema.class.php:1279 #: libraries/tbl_properties.inc.php:661 tbl_operations.php:366 @@ -217,7 +217,7 @@ msgstr "설명" #: tbl_structure.php:359 tbl_tracking.php:281 tbl_tracking.php:336 #: tbl_tracking.php:341 msgid "No" -msgstr "아니오 " +msgstr "아니오" #: db_datadict.php:233 js/messages.php:253 libraries/Index.class.php:350 #: libraries/Index.class.php:375 libraries/Index.class.php:679 From 7c1edb1586425a342851eb96be2f3982785fc9ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 25 Jun 2012 14:46:53 +0200 Subject: [PATCH 21/24] Mark private attributes as private --- libraries/Index.class.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 6ea20bec35..aef1d4f5ba 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -26,45 +26,45 @@ class PMA_Index /** * @var string The name of the schema */ - protected $_schema = ''; + private $_schema = ''; /** * @var string The name of the table */ - protected $_table = ''; + private $_table = ''; /** * @var string The name of the index */ - protected $_name = ''; + private $_name = ''; /** * Columns in index * * @var array */ - protected $_columns = array(); + private $_columns = array(); /** * The index method used (BTREE, SPATIAL, FULLTEXT, HASH, RTREE). * * @var string */ - protected $_type = ''; + private $_type = ''; /** * The index choice (PRIMARY, UNIQUE, INDEX, SPATIAL, FULLTEXT) * * @var string */ - protected $_choice = ''; + private $_choice = ''; /** * Various remarks. * * @var string */ - protected $_remarks = ''; + private $_remarks = ''; /** * Any comment provided for the index with a COMMENT attribute when the @@ -72,19 +72,19 @@ class PMA_Index * * @var string */ - protected $_comment = ''; + private $_comment = ''; /** * @var integer 0 if the index cannot contain duplicates, 1 if it can. */ - protected $_non_unique = 0; + private $_non_unique = 0; /** * Indicates how the key is packed. NULL if it is not. * * @var string */ - protected $_packed = null; + private $_packed = null; /** * Constructor @@ -617,17 +617,17 @@ class PMA_Index_Column /** * @var string The column name */ - protected $_name = ''; + private $_name = ''; /** * @var integer The column sequence number in the index, starting with 1. */ - protected $_seq_in_index = 1; + private $_seq_in_index = 1; /** * @var string How the column is sorted in the index. “A” (Ascending) or NULL (Not sorted) */ - protected $_collation = null; + private $_collation = null; /** * The number of indexed characters if the column is only partly indexed, @@ -635,7 +635,7 @@ class PMA_Index_Column * * @var integer */ - protected $_sub_part = null; + private $_sub_part = null; /** * Contains YES if the column may contain NULL. @@ -643,7 +643,7 @@ class PMA_Index_Column * * @var string */ - protected $_null = ''; + private $_null = ''; /** * An estimate of the number of unique values in the index. This is updated @@ -654,7 +654,7 @@ class PMA_Index_Column * * @var integer */ - protected $_cardinality = null; + private $_cardinality = null; public function __construct($params = array()) { From 479e4909cb3c67f30732cf2d16e077c6d8ae1aa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 25 Jun 2012 14:51:04 +0200 Subject: [PATCH 22/24] Wrap some long lines --- libraries/Index.class.php | 69 +++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 18 deletions(-) diff --git a/libraries/Index.class.php b/libraries/Index.class.php index aef1d4f5ba..41cc2d02cc 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -202,7 +202,8 @@ class PMA_Index // $columns[names][] // $columns[sub_parts][] foreach ($columns['names'] as $key => $name) { - $sub_part = isset($columns['sub_parts'][$key]) ? $columns['sub_parts'][$key] : ''; + $sub_part = isset($columns['sub_parts'][$key]) + ? $columns['sub_parts'][$key] : ''; $_columns[] = array( 'Column_name' => $name, 'Sub_part' => $sub_part, @@ -433,7 +434,10 @@ class PMA_Index if (! $print_mode) { $r = '
'; $r .= '' . __('Indexes'); - $r .= PMA_showMySQLDocu('optimization', 'optimizing-database-structure'); + $r .= PMA_showMySQLDocu( + 'optimization', + 'optimizing-database-structure' + ); $r .= ''; $r .= $no_indexes; if (count($indexes) < 1) { @@ -481,23 +485,37 @@ class PMA_Index $r .= ' ajax'; } $r .= '" ' . $row_span . '>' - . ' ' . PMA_getIcon('b_edit.png', __('Edit')) . '' . '' . "\n"; $this_params = $GLOBALS['url_params']; if ($index->getName() == 'PRIMARY') { - $this_params['sql_query'] = 'ALTER TABLE ' . PMA_backquote($table) . ' DROP PRIMARY KEY;'; - $this_params['message_to_show'] = __('The primary key has been dropped'); - $js_msg = PMA_jsFormat('ALTER TABLE ' . $table . ' DROP PRIMARY KEY'); + $this_params['sql_query'] = 'ALTER TABLE ' + . PMA_backquote($table) . ' DROP PRIMARY KEY;'; + $this_params['message_to_show'] + = __('The primary key has been dropped'); + $js_msg = PMA_jsFormat( + 'ALTER TABLE ' . $table . ' DROP PRIMARY KEY' + ); } else { - $this_params['sql_query'] = 'ALTER TABLE ' . PMA_backquote($table) . ' DROP INDEX ' . PMA_backquote($index->getName()) . ';'; - $this_params['message_to_show'] = sprintf(__('Index %s has been dropped'), $index->getName()); - $js_msg = PMA_jsFormat('ALTER TABLE ' . $table . ' DROP INDEX ' . $index->getName()) . ';'; + $this_params['sql_query'] = 'ALTER TABLE ' + . PMA_backquote($table) . ' DROP INDEX ' + . PMA_backquote($index->getName()) . ';'; + $this_params['message_to_show'] = sprintf( + __('Index %s has been dropped'), + $index->getName() + ); + $js_msg = PMA_jsFormat( + 'ALTER TABLE ' . $table . ' DROP INDEX ' + . $index->getName() . ';' + ); } $r .= ''; - $r .= ''; + $r .= ''; $r .= ' ' . htmlspecialchars($index->getName()) . ''; + $r .= '' + . htmlspecialchars($index->getName()) + . ''; } else { - $r .= '' . htmlspecialchars($index->getName()) . ''; + $r .= '' + . htmlspecialchars($index->getName()) + . ''; } - $r .= '' . htmlspecialchars($index->getType()) . ''; + $r .= '' + . htmlspecialchars($index->getType()) + . ''; $r .= '' . $index->isUnique(true) . ''; $r .= '' . $index->isPacked(true) . ''; @@ -526,9 +550,15 @@ class PMA_Index $r .= ' (' . $column->getSubPart() . ')'; } $r .= ''; - $r .= '' . htmlspecialchars($column->getCardinality()) . ''; - $r .= '' . htmlspecialchars($column->getCollation()) . ''; - $r .= '' . htmlspecialchars($column->getNull(true)) . ''; + $r .= '' + . htmlspecialchars($column->getCardinality()) + . ''; + $r .= '' + . htmlspecialchars($column->getCollation()) + . ''; + $r .= '' + . htmlspecialchars($column->getNull(true)) + . ''; if ($column->getSeqInIndex() == 1) { $r .= '' @@ -595,7 +625,9 @@ class PMA_Index // did not find any difference // so it makes no sense to have this two equal indexes - $message = PMA_Message::notice(__('The indexes %1$s and %2$s seem to be equal and one of them could possibly be removed.')); + $message = PMA_Message::notice( + __('The indexes %1$s and %2$s seem to be equal and one of them could possibly be removed.') + ); $message->addParam($each_index->getName()); $message->addParam($while_index->getName()); $output .= $message->getDisplay(); @@ -625,7 +657,8 @@ class PMA_Index_Column private $_seq_in_index = 1; /** - * @var string How the column is sorted in the index. “A” (Ascending) or NULL (Not sorted) + * @var string How the column is sorted in the index. “A” (Ascending) or + * NULL (Not sorted) */ private $_collation = null; From 691fae14fe25c19f1d5914b5f1d91921e95986f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 25 Jun 2012 14:51:42 +0200 Subject: [PATCH 23/24] Mark private attributes as private --- libraries/Index.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 41cc2d02cc..8a6624e989 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -21,7 +21,7 @@ class PMA_Index * * @var array */ - protected static $_registry = array(); + private static $_registry = array(); /** * @var string The name of the schema @@ -157,7 +157,7 @@ class PMA_Index * * @return boolean whether loading was successful */ - static protected function _loadIndexes($table, $schema) + static private function _loadIndexes($table, $schema) { if (isset(PMA_Index::$_registry[$schema][$table])) { return true; From fea07f0a0ed92c21170da24737cd15f23566f4d7 Mon Sep 17 00:00:00 2001 From: "J.M" Date: Mon, 25 Jun 2012 16:27:08 +0200 Subject: [PATCH 24/24] ajax_request might not be set in tbl_operations --- tbl_operations.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tbl_operations.php b/tbl_operations.php index e2d1e25319..86993edec0 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -231,7 +231,7 @@ if (isset($result) && empty($message_to_show)) { $_message = $result ? $message = PMA_Message::success(__('Your SQL query has been executed successfully')) : PMA_Message::error(__('Error')); // $result should exist, regardless of $_message $_type = $result ? 'success' : 'error'; - if ($GLOBALS['ajax_request'] == true) { + if (isset($GLOBALS['ajax_request']) && $GLOBALS['ajax_request'] == true) { $response = PMA_Response::getInstance(); $response->isSuccess($_message->isSuccess()); $response->addJSON('message', $_message);