From 86a7e9995a246efdfd18a6053b6ab373fd6cd8e7 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 28 Oct 2012 11:47:19 +0100 Subject: [PATCH 01/15] Translated using Weblate. --- po/si.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/po/si.po b/po/si.po index 72c5835c8700..65f0d7672898 100644 --- a/po/si.po +++ b/po/si.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2012-08-27 10:41+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2012-10-28 11:47+0200\n" +"Last-Translator: Madhura Jayaratne \n" "Language-Team: Sinhala \n" "Language: si\n" "MIME-Version: 1.0\n" @@ -4516,6 +4516,8 @@ msgid "" "authentication[/a] (not located in your document root; suggested: /etc/" "swekey.conf)" msgstr "" +"[a@http://swekey.com]SweKey දෘඩාංග සත්‍යාපනය[/a] සඳහා අවශ්‍ය වින්‍යාස ගොනුව " +"අඩංගු ස්ථානය.(ඔබගේ ලියකියවිලි මූලයේ අඩංගු නැත. යෝජිත: /etc/swekey.conf)" #: libraries/config/messages.inc.php:371 msgid "SweKey config file" @@ -5988,7 +5990,7 @@ msgstr "" #: libraries/engines/myisam.lib.php:27 msgid "Automatic recovery mode" -msgstr "" +msgstr "ස්වයංක්‍රීය ප්‍රතිසාධන ප්‍රකාරය" #: libraries/engines/myisam.lib.php:28 msgid "" From 21e0849504ea84c0afb267b03187bf6643f66937 Mon Sep 17 00:00:00 2001 From: Praveen Illa Date: Sun, 28 Oct 2012 10:30:25 +0100 Subject: [PATCH 02/15] Translated using Weblate. --- po/te.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/te.po b/po/te.po index 598c160312e2..caead951b5ea 100644 --- a/po/te.po +++ b/po/te.po @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2012-05-17 15:16+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Telugu \n" +"PO-Revision-Date: 2012-10-28 10:30+0200\n" +"Last-Translator: Praveen_Illa \n" +"Language-Team: Telugu \n" "Language: te\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 1.0\n" +"X-Generator: Weblate 1.2\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353 #: libraries/display_tbl.lib.php:359 server_privileges.php:1679 @@ -122,7 +122,7 @@ msgstr "" #: db_create.php:60 #, php-format msgid "Database %1$s has been created." -msgstr "" +msgstr "%1$s డేటాబేసు సృష్టించబడింది" #: db_datadict.php:49 db_operations.php:370 msgid "Database comment: " @@ -172,7 +172,7 @@ msgstr "రకం" #: tbl_printview.php:138 tbl_structure.php:206 tbl_tracking.php:260 #: tbl_tracking.php:326 tbl_zoom_select.php:442 msgid "Null" -msgstr "" +msgstr "శూన్యం" #: db_datadict.php:166 db_structure.php:548 libraries/export/htmlword.php:252 #: libraries/export/latex.php:397 libraries/export/odt.php:309 From b2efe2e2ea8e6ac017059db94a87abc0f68c643f Mon Sep 17 00:00:00 2001 From: Janis Reinsons Date: Wed, 31 Oct 2012 03:22:44 +0100 Subject: [PATCH 03/15] Translated using Weblate. --- po/lv.po | 295 ++++++++++++++++++++++--------------------------------- 1 file changed, 119 insertions(+), 176 deletions(-) diff --git a/po/lv.po b/po/lv.po index a76901b44da2..87b0aadd1761 100644 --- a/po/lv.po +++ b/po/lv.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2012-09-05 10:33+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2012-10-31 03:22+0200\n" +"Last-Translator: Janis Reinsons \n" "Language-Team: Latvian \n" "Language: lv\n" "MIME-Version: 1.0\n" @@ -118,11 +118,13 @@ msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." msgstr "" +"Fails %s nav pieejams šajā sistēmā, vairāk informācijai lūdzu apmeklējiet " +"www.phpmyadmin.net." #: db_create.php:60 -#, fuzzy, php-format +#, php-format msgid "Database %1$s has been created." -msgstr "Datubāze %s tika izdzēsta." +msgstr "Datubāze %1$s tika izveidota." #: db_datadict.php:49 db_operations.php:370 msgid "Database comment: " @@ -143,10 +145,9 @@ msgstr "Komentārs tabulai" #: tbl_change.php:318 tbl_indexes.php:213 tbl_printview.php:136 #: tbl_relation.php:395 tbl_tracking.php:257 tbl_tracking.php:323 #: tbl_zoom_select.php:441 -#, fuzzy #| msgid "Column names" msgid "Column" -msgstr "Kolonnu nosaukumi" +msgstr "Lauks" #: db_datadict.php:163 db_printview.php:103 libraries/Index.class.php:441 #: libraries/db_structure.lib.php:46 libraries/export/htmlword.php:250 @@ -423,10 +424,10 @@ msgid "You have to choose at least one column to display" msgstr "Izvēlieties vismaz vienu kolonnu attēlošanai" #: db_qbe.php:186 -#, fuzzy, php-format +#, php-format #| msgid "Switch to copied table" msgid "Switch to %svisual builder%s" -msgstr "Pārslēgties uz nokopēto tabulu" +msgstr "Pārslēgties uz %svisual builder%s" #: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:1003 @@ -775,16 +776,15 @@ msgstr "Datubāze" #: db_tracking.php:87 msgid "Last version" -msgstr "" +msgstr "Pēdējā versija" #: db_tracking.php:88 tbl_tracking.php:651 -#, fuzzy msgid "Created" -msgstr "Izveidot" +msgstr "Izveidots" #: db_tracking.php:89 tbl_tracking.php:652 msgid "Updated" -msgstr "" +msgstr "Atjaunots" #: db_tracking.php:90 js/messages.php:189 libraries/rte/rte_events.lib.php:397 #: libraries/rte/rte_list.lib.php:67 libraries/server_links.inc.php:51 @@ -806,16 +806,15 @@ msgstr "" #: db_tracking.php:120 tbl_tracking.php:605 tbl_tracking.php:663 msgid "active" -msgstr "" +msgstr "aktīvs" #: db_tracking.php:122 tbl_tracking.php:607 tbl_tracking.php:665 msgid "not active" -msgstr "" +msgstr "neaktīvs" #: db_tracking.php:135 -#, fuzzy msgid "Versions" -msgstr "Persiešu" +msgstr "Versijas" #: db_tracking.php:136 tbl_tracking.php:415 tbl_tracking.php:683 msgid "Tracking report" @@ -836,9 +835,8 @@ msgid "Track table" msgstr "Pārbaudīt tabulu" #: db_tracking.php:227 -#, fuzzy msgid "Database Log" -msgstr "Datubāze" +msgstr "Datubāzes žurnāls" #: enum_editor.php:23 js/messages.php:272 #: libraries/rte/rte_routines.lib.php:707 @@ -866,26 +864,24 @@ msgstr "Pievienot jaunu lietotāju" #: enum_editor.php:99 gis_data_editor.php:317 msgid "Output" -msgstr "" +msgstr "Izvads" #: enum_editor.php:100 msgid "Copy and paste the joined values into the \"Length/Values\" field" msgstr "" #: export.php:29 -#, fuzzy msgid "Bad type!" -msgstr "Vaicājuma tips" +msgstr "Nepareizs tips!" #: export.php:77 msgid "Selected export type has to be saved in file!" -msgstr "" +msgstr "Izvēlētais eksporta tips atbalsta tikkai saglabāšanu failā!" #: export.php:106 -#, fuzzy #| msgid "Add new field" msgid "Bad parameters!" -msgstr "Pievienot jaunu lauku" +msgstr "Nepareizi parametri!" #: export.php:166 export.php:191 export.php:652 #, php-format @@ -911,80 +907,75 @@ msgid "Dump has been saved to file %s." msgstr "Damps tika saglabāts failā %s." #: file_echo.php:21 -#, fuzzy msgid "Invalid export type" -msgstr "Eksporta veids" +msgstr "Nepareizs eksporta veids" #: gis_data_editor.php:84 #, php-format msgid "Value for the column \"%s\"" -msgstr "" +msgstr "Kolonnas vērtība \"%s\"" #: gis_data_editor.php:113 tbl_gis_visualization.php:172 msgid "Use OpenStreetMaps as Base Layer" -msgstr "" +msgstr "Izmantot OpenStreetMaps kā pamata pārklājumu" #: gis_data_editor.php:134 msgid "SRID" -msgstr "" +msgstr "SRID" #: gis_data_editor.php:151 js/messages.php:326 #: libraries/display_tbl.lib.php:693 msgid "Geometry" -msgstr "" +msgstr "Ģeometrija" #: gis_data_editor.php:172 js/messages.php:322 msgid "Point" -msgstr "" +msgstr "Punkts" #: gis_data_editor.php:173 gis_data_editor.php:197 gis_data_editor.php:245 #: gis_data_editor.php:297 js/messages.php:320 msgid "X" -msgstr "" +msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:199 gis_data_editor.php:247 #: gis_data_editor.php:299 js/messages.php:321 msgid "Y" -msgstr "" +msgstr "Y" #: gis_data_editor.php:195 gis_data_editor.php:243 gis_data_editor.php:295 #: js/messages.php:323 #, php-format msgid "Point %d" -msgstr "" +msgstr "Punkts %d" #: gis_data_editor.php:204 gis_data_editor.php:250 gis_data_editor.php:302 #: js/messages.php:329 -#, fuzzy #| msgid "Add new field" msgid "Add a point" -msgstr "Pievienot jaunu lauku" +msgstr "Pievienot punktu" #: gis_data_editor.php:220 js/messages.php:324 -#, fuzzy #| msgid "Lines terminated by" msgid "Linestring" -msgstr "Rindas atdalītas ar" +msgstr "Līnija" #: gis_data_editor.php:223 gis_data_editor.php:279 js/messages.php:328 msgid "Outer Ring" -msgstr "" +msgstr "Ārējais aplis" #: gis_data_editor.php:225 gis_data_editor.php:281 js/messages.php:327 msgid "Inner Ring" -msgstr "" +msgstr "Iekšējais aplis" #: gis_data_editor.php:252 -#, fuzzy #| msgid "Add a new User" msgid "Add a linestring" -msgstr "Pievienot jaunu lietotāju" +msgstr "Pievienot līniju" #: gis_data_editor.php:252 gis_data_editor.php:304 js/messages.php:330 -#, fuzzy #| msgid "Add a new User" msgid "Add an inner ring" -msgstr "Pievienot jaunu lietotāju" +msgstr "Pievienot iekšējo loku" #: gis_data_editor.php:266 js/messages.php:325 msgid "Polygon" @@ -1016,7 +1007,7 @@ msgstr "" #: import.php:170 import.php:419 msgid "Showing bookmark" -msgstr "" +msgstr "Rāda grāmatzīmi" #: import.php:180 import.php:415 msgid "The bookmark has been deleted." @@ -1050,17 +1041,17 @@ msgstr "" #: import.php:390 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" -msgstr "" +msgstr "Nevar ielādēt importētos spraudņus, lūdzu pārbaudi savu instalāciju!" #: import.php:421 sql.php:933 #, php-format msgid "Bookmark %s created" -msgstr "" +msgstr "Grāmatzīme %s izveidota" #: import.php:427 import.php:433 #, php-format msgid "Import has been successfully finished, %d queries executed." -msgstr "" +msgstr "Importēšana veiksmīga, %d pieprasījumi izpildīti." #: import.php:442 msgid "" @@ -1104,16 +1095,14 @@ msgid "You are about to DESTROY a complete database!" msgstr "Jūs taisaties LIKVIDĒT veselu datubāzi!" #: js/messages.php:32 -#, fuzzy #| msgid "You are about to DESTROY a complete database!" msgid "You are about to DESTROY a complete table!" -msgstr "Jūs taisaties LIKVIDĒT veselu datubāzi!" +msgstr "Jūs taisaties LIKVIDĒT veselu tabulu!" #: js/messages.php:33 -#, fuzzy #| msgid "You are about to DESTROY a complete database!" msgid "You are about to TRUNCATE a complete table!" -msgstr "Jūs taisaties LIKVIDĒT veselu datubāzi!" +msgstr "Jūs taisaties LIKVIDĒT veselu tabulu!" #: js/messages.php:35 #, fuzzy @@ -1123,11 +1112,11 @@ msgstr "Ļauj ievietot un mainīt datus." #: js/messages.php:36 msgid "Dropping Primary Key/Index" -msgstr "" +msgstr "Noņem primāro Atslēgu/Indeksu" #: js/messages.php:37 msgid "This operation could take a long time. Proceed anyway?" -msgstr "" +msgstr "Šī operacīja var aizņemt ilgāku laiku. Turpināt?" #: js/messages.php:40 msgid "You are about to DISABLE a BLOB Repository!" @@ -1147,29 +1136,26 @@ msgid "This is not a number!" msgstr "Tas nav numurs!" #: js/messages.php:46 -#, fuzzy #| msgid "Add new field" msgid "Add Index" -msgstr "Pievienot jaunu lauku" +msgstr "Pievienot indeksu" #: js/messages.php:47 -#, fuzzy #| msgid "Index" msgid "Edit Index" -msgstr "Indekss" +msgstr "Labot indeksu" #: js/messages.php:48 tbl_indexes.php:293 -#, fuzzy, php-format +#, php-format #| msgid "Add %s field(s)" msgid "Add %d column(s) to index" -msgstr "Pievienot %s lauku(s)" +msgstr "Pievienot %d lauku(s) indeksam" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:52 -#, fuzzy #| msgid "Total" msgid "Total count" -msgstr "Kopā" +msgstr "Kopējais skaits" #: js/messages.php:55 msgid "The host name is empty!" @@ -1189,26 +1175,23 @@ msgstr "Paroles nesakrīt!" #: js/messages.php:59 server_privileges.php:1775 server_privileges.php:1799 #: server_privileges.php:2211 server_privileges.php:2416 -#, fuzzy #| msgid "Any user" msgid "Add user" -msgstr "Jebkurš lietotājs" +msgstr "Pievienot lietotāju" #: js/messages.php:60 -#, fuzzy msgid "Reloading Privileges" -msgstr "Globālās privilēģijas" +msgstr "Atjauno privilēģijas" #: js/messages.php:61 -#, fuzzy #| msgid "Remove selected users" msgid "Removing Selected Users" -msgstr "Dzēst izvēlētos lietotājus" +msgstr "Dzēš izvēlētos lietotājus" #: js/messages.php:62 js/messages.php:141 tbl_tracking.php:235 #: tbl_tracking.php:415 msgid "Close" -msgstr "" +msgstr "Aizvērt" #: js/messages.php:65 js/messages.php:284 libraries/Index.class.php:468 #: libraries/common.lib.php:644 libraries/common.lib.php:1193 @@ -1219,23 +1202,21 @@ msgid "Edit" msgstr "Labot" #: js/messages.php:66 server_status.php:812 -#, fuzzy #| msgid "Server Choice" msgid "Live traffic chart" -msgstr "Servera izvēle" +msgstr "Dzīvā satiksmes diagrama" #: js/messages.php:67 server_status.php:815 msgid "Live conn./process chart" msgstr "" #: js/messages.php:68 server_status.php:837 -#, fuzzy msgid "Live query chart" -msgstr "SQL vaicājums" +msgstr "Dzīvā pieprasījumu diagramma" #: js/messages.php:70 msgid "Static data" -msgstr "" +msgstr "Statiski dati" #. l10n: Total number of queries #: js/messages.php:72 libraries/build_html_for_db.lib.php:46 @@ -1248,7 +1229,7 @@ msgstr "Kopā" #. l10n: Other, small valued, queries #: js/messages.php:74 server_status.php:608 server_status.php:1035 msgid "Other" -msgstr "" +msgstr "Cits" #. l10n: Thousands separator #: js/messages.php:76 libraries/common.lib.php:1448 @@ -1283,10 +1264,9 @@ msgid "Processes" msgstr "Procesi" #: js/messages.php:85 -#, fuzzy #| msgid "Connections" msgid "Connections / Processes" -msgstr "Konekcijas" +msgstr "Savienojumi / Procesi" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:87 @@ -1299,9 +1279,8 @@ msgid "Questions (executed statements by the server)" msgstr "" #: js/messages.php:91 server_status.php:790 -#, fuzzy msgid "Query statistics" -msgstr "Rindas statistika" +msgstr "Pieprasījumu statistika" #: js/messages.php:94 msgid "Local monitor configuration incompatible" @@ -1321,22 +1300,20 @@ msgid "Query cache efficiency" msgstr "Vaicājuma tips" #: js/messages.php:98 -#, fuzzy msgid "Query cache usage" -msgstr "Vaicājuma tips" +msgstr "Pieprasījumu kešatmiņas lietojums" #: js/messages.php:99 -#, fuzzy msgid "Query cache used" -msgstr "Vaicājuma tips" +msgstr "Izmantotā pieprasījumu kešatmiņa" #: js/messages.php:101 msgid "System CPU Usage" -msgstr "" +msgstr "Sistēmas CPU noslodze" #: js/messages.php:102 msgid "System memory" -msgstr "" +msgstr "Sistēmas atmiņa" #: js/messages.php:103 msgid "System swap" @@ -1356,13 +1333,12 @@ msgstr "KB" #: js/messages.php:107 msgid "Average load" -msgstr "" +msgstr "Vidējais noslogojums" #: js/messages.php:108 -#, fuzzy #| msgid "Total" msgid "Total memory" -msgstr "Kopā" +msgstr "Kopējā atmiņa" #: js/messages.php:109 msgid "Cached memory" @@ -1374,11 +1350,11 @@ msgstr "" #: js/messages.php:111 msgid "Free memory" -msgstr "" +msgstr "Brīvā atmiņa" #: js/messages.php:112 msgid "Used memory" -msgstr "" +msgstr "Izmantotā atmiņa" #: js/messages.php:114 #, fuzzy @@ -1403,10 +1379,9 @@ msgid "Bytes sent" msgstr "" #: js/messages.php:120 -#, fuzzy #| msgid "Received" msgid "Bytes received" -msgstr "Saņemts" +msgstr "Saņemtie baiti" #: js/messages.php:121 server_status.php:1158 msgid "Connections" @@ -1438,16 +1413,15 @@ msgid "EiB" msgstr "EB" #: js/messages.php:132 -#, fuzzy, php-format +#, php-format #| msgid "%s table(s)" msgid "%d table(s)" -msgstr "%s tabula(s)" +msgstr "%d tabula(s)" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:135 -#, fuzzy msgid "Questions" -msgstr "Persiešu" +msgstr "Jautājumi" #: js/messages.php:136 server_status.php:1113 msgid "Traffic" @@ -1455,20 +1429,18 @@ msgstr "Datu apmaiņa" #: js/messages.php:137 libraries/server_links.inc.php:73 #: server_status.php:1574 -#, fuzzy #| msgid "General relation features" msgid "Settings" -msgstr "Galvenās relāciju īpašības" +msgstr "Uzstādījumi" #: js/messages.php:138 -#, fuzzy #| msgid "Rename database to" msgid "Remove chart" -msgstr "Pārsaukt datubāzi par" +msgstr "Noņemt diagrammu" #: js/messages.php:139 msgid "Edit title and labels" -msgstr "" +msgstr "Labot virsrakstu un nosaukumus" #: js/messages.php:140 msgid "Add chart to grid" @@ -1546,17 +1518,17 @@ msgstr "Saglabāt kā failu" #. l10n: Enable in this context means setting a status variable to ON #: js/messages.php:159 -#, fuzzy, php-format +#, php-format #| msgid "Enabled" msgid "Enable %s" -msgstr "Ieslēgts" +msgstr "Ieslēgt %s" #. l10n: Disable in this context means setting a status variable to OFF #: js/messages.php:161 -#, fuzzy, php-format +#, php-format #| msgid "Disable" msgid "Disable %s" -msgstr "Izslēgts" +msgstr "Izslēgt %s" #. l10n: %d seconds #: js/messages.php:163 @@ -1571,22 +1543,19 @@ msgid "" msgstr "" #: js/messages.php:165 -#, fuzzy #| msgid "General relation features" msgid "Change settings" -msgstr "Galvenās relāciju īpašības" +msgstr "Mainīt uzstādījumus" #: js/messages.php:166 -#, fuzzy #| msgid "General relation features" msgid "Current settings" -msgstr "Galvenās relāciju īpašības" +msgstr "Pašreizējie uzstādījumi" #: js/messages.php:168 server_status.php:1664 -#, fuzzy #| msgid "Import files" msgid "Chart Title" -msgstr "Importēt failus" +msgstr "Diagrammas virsraksts" #. l10n: As in differential values #: js/messages.php:170 @@ -1600,7 +1569,7 @@ msgstr "" #: js/messages.php:172 msgid "Unit" -msgstr "" +msgstr "Vienība" #: js/messages.php:174 msgid "From slow log" @@ -1621,7 +1590,7 @@ msgstr "" #: js/messages.php:178 msgid "Cancel request" -msgstr "" +msgstr "Atcelt pieprasījumu" #: js/messages.php:179 msgid "" @@ -1647,10 +1616,9 @@ msgid "Jump to Log table" msgstr "Nav datubāzu" #: js/messages.php:184 -#, fuzzy #| msgid "No databases" msgid "No data found" -msgstr "Nav datubāzu" +msgstr "Dati netika atrasti" #: js/messages.php:185 msgid "Log analysed, but no data found in this time span." @@ -1658,13 +1626,12 @@ msgstr "" #: js/messages.php:187 msgid "Analyzing..." -msgstr "" +msgstr "Analizē..." #: js/messages.php:188 -#, fuzzy #| msgid "Explain SQL" msgid "Explain output" -msgstr "Izskaidrot SQL" +msgstr "Izskaidrot izvadu" #: js/messages.php:190 js/messages.php:497 libraries/rte/rte_list.lib.php:62 #: server_status.php:1254 sql.php:897 @@ -1672,10 +1639,9 @@ msgid "Time" msgstr "Laiks" #: js/messages.php:191 -#, fuzzy #| msgid "Total" msgid "Total time:" -msgstr "Kopā" +msgstr "Kopējais laiks:" #: js/messages.php:192 #, fuzzy @@ -1691,10 +1657,9 @@ msgid "Table" msgstr "Tabula" #: js/messages.php:194 -#, fuzzy #| msgid "Charset" msgid "Chart" -msgstr "Kodējums" +msgstr "Diagramma" #: js/messages.php:195 #, fuzzy @@ -1703,9 +1668,8 @@ msgid "Edit chart" msgstr "Pievienot jaunu lauku" #: js/messages.php:196 -#, fuzzy msgid "Series" -msgstr "SQL vaicājums" +msgstr "Sērijas" #. l10n: A collection of available filters #: js/messages.php:199 @@ -1717,7 +1681,7 @@ msgstr "Tabulas opcijas" #. l10n: Filter as in "Start Filtering" #: js/messages.php:201 msgid "Filter" -msgstr "" +msgstr "Filtrs" #: js/messages.php:202 msgid "Filter queries by word/regexp:" @@ -1734,10 +1698,9 @@ msgid "Sum of grouped rows:" msgstr "Rindu skaits vienā lapā" #: js/messages.php:205 -#, fuzzy #| msgid "Total" msgid "Total:" -msgstr "Kopā" +msgstr "Kopā:" #: js/messages.php:207 #, fuzzy @@ -1756,14 +1719,13 @@ msgid "" msgstr "" #: js/messages.php:210 -#, fuzzy #| msgid "Rename database to" msgid "Reload page" -msgstr "Pārsaukt datubāzi par" +msgstr "Pārlādēt lapu" #: js/messages.php:212 msgid "Affected rows:" -msgstr "" +msgstr "Aizskartās rindas:" #: js/messages.php:214 msgid "Failed parsing config file. It doesn't seem to be valid JSON code." @@ -1779,9 +1741,8 @@ msgstr "" #: libraries/db_links.inc.php:82 libraries/display_import.lib.php:126 #: libraries/server_links.inc.php:69 libraries/tbl_links.inc.php:89 #: prefs_manage.php:229 server_status.php:1619 setup/frames/menu.inc.php:20 -#, fuzzy msgid "Import" -msgstr "Eksports" +msgstr "Imports" #: js/messages.php:217 msgid "Import monitor configuration" @@ -1789,13 +1750,12 @@ msgstr "" #: js/messages.php:218 msgid "Please select the file you want to import" -msgstr "" +msgstr "Lūdzu izvēlies importējamo failu" #: js/messages.php:220 -#, fuzzy #| msgid "Update Query" msgid "Analyse Query" -msgstr "Atjaunot vaicājumu" +msgstr "Analizēt pieprasījumu" #: js/messages.php:224 msgid "Advisor system" @@ -1807,17 +1767,16 @@ msgstr "" #: js/messages.php:226 msgid "Issue" -msgstr "" +msgstr "Problēma" #: js/messages.php:227 -#, fuzzy #| msgid "Documentation" msgid "Recommendation" -msgstr "Dokumentācija" +msgstr "Ieteikums" #: js/messages.php:228 msgid "Rule details" -msgstr "" +msgstr "Noteikuma detaļas" #: js/messages.php:229 #, fuzzy @@ -1831,28 +1790,26 @@ msgstr "" #: js/messages.php:231 msgid "Test" -msgstr "" +msgstr "Tests" #: js/messages.php:236 pmd_general.php:382 pmd_general.php:419 #: pmd_general.php:539 pmd_general.php:587 pmd_general.php:663 #: pmd_general.php:717 pmd_general.php:780 pmd_general.php:811 msgid "Cancel" -msgstr "" +msgstr "Atcelt" #: js/messages.php:239 -#, fuzzy msgid "Loading" -msgstr "Lokāls" +msgstr "Ielādē" #: js/messages.php:240 -#, fuzzy #| msgid "Processes" msgid "Processing Request" -msgstr "Procesi" +msgstr "Apstrādā pieprasījumu" #: js/messages.php:241 libraries/rte/rte_export.lib.php:39 msgid "Error in Processing Request" -msgstr "" +msgstr "Kļūda apstrādājot pieprasījumu" #: js/messages.php:242 msgid "Dropping Column" @@ -1879,22 +1836,19 @@ msgid "Renaming Databases" msgstr "Pārsaukt datubāzi par" #: js/messages.php:249 -#, fuzzy #| msgid "Rename database to" msgid "Reload Database" -msgstr "Pārsaukt datubāzi par" +msgstr "Pārlādēt datubāzi" #: js/messages.php:250 -#, fuzzy #| msgid "Copy database to" msgid "Copying Database" -msgstr "Kopēt datubāzi uz" +msgstr "Kopē datubāzi" #: js/messages.php:251 -#, fuzzy #| msgid "Charset" msgid "Changing Charset" -msgstr "Kodējums" +msgstr "Maina kodējumu" #: js/messages.php:252 #, fuzzy @@ -1921,32 +1875,27 @@ msgid "Show indexes" msgstr "Rādīt režģi" #: js/messages.php:262 -#, fuzzy #| msgid "Search" msgid "Searching" -msgstr "Meklēt" +msgstr "Meklē" #: js/messages.php:263 -#, fuzzy msgid "Hide search results" -msgstr "SQL vaicājums" +msgstr "Slēpt meklēšanas rezultātus" #: js/messages.php:264 -#, fuzzy msgid "Show search results" -msgstr "SQL vaicājums" +msgstr "Rādīt meklēšanas rezultātus" #: js/messages.php:265 -#, fuzzy #| msgid "Browse" msgid "Browsing" -msgstr "Apskatīt" +msgstr "Apskata" #: js/messages.php:266 -#, fuzzy #| msgid "Deleting %s" msgid "Deleting" -msgstr "Dzēšam %s" +msgstr "Dzēš" #: js/messages.php:269 msgid "The definition of a stored function must contain a RETURN statement!" @@ -1963,14 +1912,12 @@ msgid "" msgstr "" #: js/messages.php:282 -#, fuzzy msgid "Hide query box" -msgstr "SQL vaicājums" +msgstr "Slēpt pieprasījumu logu" #: js/messages.php:283 -#, fuzzy msgid "Show query box" -msgstr "SQL vaicājums" +msgstr "Rādīt pieprasījumu logu" #: js/messages.php:285 tbl_row_action.php:28 msgid "No rows selected" @@ -2000,14 +1947,12 @@ msgid "Save" msgstr "Saglabāt" #: js/messages.php:294 -#, fuzzy msgid "Hide search criteria" -msgstr "SQL vaicājums" +msgstr "Slēpt meklēšanas kritērijus" #: js/messages.php:295 -#, fuzzy msgid "Show search criteria" -msgstr "SQL vaicājums" +msgstr "Rādīt meklēšanas kritērijus" #: js/messages.php:298 libraries/tbl_select.lib.php:110 #, fuzzy @@ -2040,20 +1985,18 @@ msgid "The plot can be resized by dragging it along the bottom right corner." msgstr "" #: js/messages.php:312 -#, fuzzy #| msgid "Add/Delete Field Columns" msgid "Select two columns" -msgstr "Pievienot/Dzēst laukus (kolonnas)" +msgstr "Izvēlies 2 kolonnas" #: js/messages.php:313 msgid "Select two different columns" -msgstr "" +msgstr "Izvēlies 2 dažādas kolonnas" #: js/messages.php:314 -#, fuzzy #| msgid "SQL result" msgid "Query results" -msgstr "SQL rezultāts" +msgstr "Pieprasījuma rezultāti" #: js/messages.php:315 #, fuzzy @@ -2068,7 +2011,7 @@ msgstr "Ignorēt" #: js/messages.php:319 libraries/display_tbl.lib.php:1391 msgid "Copy" -msgstr "" +msgstr "Kopēt" #: js/messages.php:334 #, fuzzy From 7f65443c83b2637f20ccb30105777460761b73e0 Mon Sep 17 00:00:00 2001 From: Rui Simoes Date: Wed, 31 Oct 2012 11:31:27 +0100 Subject: [PATCH 04/15] Translated using Weblate. --- po/pt.po | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/po/pt.po b/po/pt.po index fdf677f6f692..10e303c9d746 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2012-10-21 18:04+0200\n" -"Last-Translator: Nuno Ferreira \n" +"PO-Revision-Date: 2012-10-31 11:31+0200\n" +"Last-Translator: Rui Simoes \n" "Language-Team: Portuguese " "\n" "Language: pt\n" @@ -4262,7 +4262,6 @@ msgstr "" "Número máximo de tabelas utilizadas recentemente, definir 0 para desativar" #: libraries/config/messages.inc.php:291 -#, fuzzy #| msgid "Untracked tables" msgid "Recently used tables" msgstr "Tabelas utilizadas recentemente" @@ -4622,11 +4621,11 @@ msgstr "Permitir login como root" #: libraries/config/messages.inc.php:368 msgid "HTTP Basic Auth Realm name to display when doing HTTP Auth" -msgstr "" +msgstr "Nome do Domínio a apresentar quando é feita autenticação HTTP" #: libraries/config/messages.inc.php:369 msgid "HTTP Realm" -msgstr "" +msgstr "Domínio HTTP" #: libraries/config/messages.inc.php:370 msgid "" @@ -4634,10 +4633,13 @@ msgid "" "authentication[/a] (not located in your document root; suggested: /etc/" "swekey.conf)" msgstr "" +"O caminho para o ficheiro de configuração [a@http://swekey.com] autenticação " +"da maquina SweKey [/a] (não foi localizado na raiz do seu documento: " +"sugestão: /etc/swekey.conf)" #: libraries/config/messages.inc.php:371 msgid "SweKey config file" -msgstr "" +msgstr "Ficheiro de configuração Swekey" #: libraries/config/messages.inc.php:372 msgid "Authentication method to use" @@ -4698,6 +4700,9 @@ msgid "" "A special MySQL user configured with limited permissions, more information " "available on [a@http://wiki.phpmyadmin.net/pma/controluser]wiki[/a]" msgstr "" +"Um usuário especial MySQL será configurado com permissões limitadas, mais " +"informações disponíveis em " +"[a@http://wiki.phpmyadmin.net/pma/controluser]wiki[/a]" #: libraries/config/messages.inc.php:384 msgid "Control user" From 3ff0079a659b270894f1817befcaf2808d85c5bc Mon Sep 17 00:00:00 2001 From: Domen Date: Wed, 31 Oct 2012 11:14:25 +0100 Subject: [PATCH 05/15] Translated using Weblate. --- po/sl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/sl.po b/po/sl.po index 705ccce11cad..1d942fe30d5a 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2012-10-27 11:05+0200\n" +"PO-Revision-Date: 2012-10-31 11:14+0200\n" "Last-Translator: Domen \n" "Language-Team: Slovenian \n" "Language: sl\n" @@ -4370,7 +4370,7 @@ msgstr "Največje število vrstic za prikaz" #: libraries/config/messages.inc.php:315 msgid "Maximum number of tables displayed in table list" -msgstr "Največje število tabel prikazanih na seznamu tabel" +msgstr "Največje število tabel, prikazanih na seznamu tabel" #: libraries/config/messages.inc.php:316 msgid "Maximum tables" @@ -9100,7 +9100,7 @@ msgstr "Omogoča vstavljanje in zamenjavo podatkov." #: server_privileges.php:52 server_privileges.php:261 #: server_privileges.php:664 msgid "Allows locking tables for the current thread." -msgstr "Omogoča zaklepanje tabel za trenutno temo." +msgstr "Omogoča zaklepanje tabel za trenutno nit." #: server_privileges.php:53 server_privileges.php:728 #: server_privileges.php:730 From 90b08f2f9b05945321e5aed3c5122d11f9c20896 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Wed, 31 Oct 2012 11:52:43 +0100 Subject: [PATCH 06/15] Translated using Weblate. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 63b109645804..62c1c22d6f10 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2012-10-16 14:47+0200\n" +"PO-Revision-Date: 2012-10-31 11:52+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: Turkish \n" "Language: tr\n" @@ -4369,7 +4369,7 @@ msgstr "Görüntülemek için en fazla satır sayısı" #: libraries/config/messages.inc.php:315 msgid "Maximum number of tables displayed in table list" -msgstr "Tablo listesinde görüntülenecek olan en fazla tablo sayısıdır" +msgstr "Tablo listesinde görüntülenen en fazla tablo sayısıdır" #: libraries/config/messages.inc.php:316 msgid "Maximum tables" From 5b820cf47af4d3807a43a67b3b51d5c471ee89bd Mon Sep 17 00:00:00 2001 From: Chanaka Indrajith Date: Wed, 31 Oct 2012 23:28:54 +0530 Subject: [PATCH 07/15] Generate correct SQL when exporting set of results - MAINT_3_5_3 --- tbl_export.php | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/tbl_export.php b/tbl_export.php index 6dfd6960eabd..b63a094e18b2 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -35,33 +35,21 @@ // Need to generate WHERE clause? if (isset($where_clause)) { - // Yes => rebuild query from scratch; this doesn't work with nested - // selects :-( - $sql_query = 'SELECT '; - if (isset($analyzed_sql[0]['queryflags']['distinct'])) { - $sql_query .= ' DISTINCT '; - } - - $sql_query .= $analyzed_sql[0]['select_expr_clause']; - - if (!empty($analyzed_sql[0]['from_clause'])) { - $sql_query .= ' FROM ' . $analyzed_sql[0]['from_clause']; - } + $temp_sql_array = explode("where", strtolower($sql_query)); - $wheres = array(); - - if (isset($where_clause) && is_array($where_clause) - && count($where_clause) > 0) { - $wheres[] = '(' . implode(') OR (', $where_clause) . ')'; - } - - if (!empty($analyzed_sql[0]['where_clause'])) { - $wheres[] = $analyzed_sql[0]['where_clause']; - } + // The fields which is going to select will remain + // as it is regardless of the where clause. + // EX :- The part "SELECT `id`, `name` FROM `customers`" + // will remain same when representing the resulted rows + // from the following query + // "SELECT `id`, `name` FROM `customers` WHERE id NOT IN + // ( SELECT id FROM companies WHERE name LIKE '%u%')" + $sql_query = $temp_sql_array[0]; - if (count($wheres) > 0) { - $sql_query .= ' WHERE (' . implode(') AND (', $wheres) . ')'; + // Append the where clause using the primary key of each row + if (is_array($where_clause) && (count($where_clause) > 0)) { + $sql_query .= ' WHERE (' . implode(') OR (', $where_clause) . ')'; } if (!empty($analyzed_sql[0]['group_by_clause'])) { From f179e827fc41812390c0d00697130adb4b0b14c3 Mon Sep 17 00:00:00 2001 From: Chanaka Indrajith Date: Wed, 31 Oct 2012 23:44:46 +0530 Subject: [PATCH 08/15] Improve comments description --- tbl_export.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tbl_export.php b/tbl_export.php index b63a094e18b2..2158b7e869c5 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -39,10 +39,10 @@ $temp_sql_array = explode("where", strtolower($sql_query)); // The fields which is going to select will remain - // as it is regardless of the where clause. + // as it is regardless of the where clause(s). // EX :- The part "SELECT `id`, `name` FROM `customers`" // will remain same when representing the resulted rows - // from the following query + // from the following query, // "SELECT `id`, `name` FROM `customers` WHERE id NOT IN // ( SELECT id FROM companies WHERE name LIKE '%u%')" $sql_query = $temp_sql_array[0]; From 761f10cf35c7e4566fce8d2f85c19355ae16a669 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Wed, 31 Oct 2012 19:16:35 +0100 Subject: [PATCH 09/15] Translated using Weblate. --- po/tr.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/po/tr.po b/po/tr.po index 62c1c22d6f10..1159c68d150d 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2012-10-31 11:52+0200\n" +"PO-Revision-Date: 2012-10-31 19:16+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: Turkish \n" "Language: tr\n" @@ -4336,7 +4336,7 @@ msgstr "SQL sorgusu görüntülendiğinde kullanılan en fazla karakter sayısı #: libraries/config/messages.inc.php:308 msgid "Maximum displayed SQL length" -msgstr "En fazla görüntülenecek SQL uzunluğu" +msgstr "En fazla görüntülenen SQL uzunluğu" #: libraries/config/messages.inc.php:309 libraries/config/messages.inc.php:314 #: libraries/config/messages.inc.php:341 @@ -4359,7 +4359,7 @@ msgid "" "contains more rows, "Previous" and "Next" links will be " "shown." msgstr "" -"Sonuç grubuna göz atarken görüntülenecek satır sayısıdır. Eğer sonuç grubu " +"Sonuç grubuna göz atarken görüntülenen satır sayısıdır. Eğer sonuç grubu " "daha fazla satır içeriyorsa, "Önceki" ve "Sonraki" " "bağlantıları gösterilecektir." @@ -4380,7 +4380,7 @@ msgid "" "Disable the default warning that is displayed if mcrypt is missing for " "cookie authentication" msgstr "" -"Eğer tanımlama bilgisi kimlik doğrulaması için mcrypt eksikse, gösterilen " +"Eğer tanımlama bilgisi kimlik doğrulaması için mcrypt eksikse, görüntülenen " "varsayılan uyarıyı etkisizleştir" #: libraries/config/messages.inc.php:318 @@ -4459,7 +4459,7 @@ msgid "" "configuration storage could not be found" msgstr "" "Eğer phpMyAdmin yapılandırma depolaması için gerekli tablolardan herhangi " -"biri bulunamazsa, veritabanı ayrıntıları Yapı sayfasında gösterilen " +"biri bulunamazsa, veritabanı ayrıntıları Yapı sayfasında görüntülenen " "varsayılan uyarıyı etkisizleştir" #: libraries/config/messages.inc.php:334 @@ -5106,8 +5106,8 @@ msgid "" "Defines whether or not type fields should be initially displayed in edit/" "insert mode" msgstr "" -"Düzenle/ekle kipinde alanlar doldurulsada doldurulmasada ilk olarak " -"gösterilmesini tanımlar" +"Düzenle/ekle kipinde yazma alanlarının ilk olarak görüntülenip " +"görüntülenmemesini tanımlar" #: libraries/config/messages.inc.php:463 msgid "Show field types" From 5a313983a9bbee42767e3e3ff20f2dcc80769cef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Luiz=20Girol?= Date: Thu, 1 Nov 2012 12:48:28 +0100 Subject: [PATCH 10/15] Translated using Weblate. --- po/pt_BR.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 26a0029b0d77..c462d7c0cd8f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2012-10-23 13:32+0200\n" +"PO-Revision-Date: 2012-11-01 12:48+0200\n" "Last-Translator: André Luiz Girol \n" "Language-Team: Portuguese (Brazil) " "\n" @@ -12096,6 +12096,8 @@ msgid "" "You have a slow query rate of %s per hour, you should have less than 1%% per " "hour." msgstr "" +"A taxa de consultas (queries) lentas é de %s por hora, este número deveria " +"ser menor que 1%% por hora." #: po/advisory_rules.php:25 msgid "Long query time" From d93f410fe46b158953a173e2d19e53972cac2b90 Mon Sep 17 00:00:00 2001 From: Chanaka Indrajith Date: Thu, 1 Nov 2012 23:09:16 +0530 Subject: [PATCH 11/15] Revert commit 5b820cf changes in MAINT_3_5_3 --- tbl_export.php | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/tbl_export.php b/tbl_export.php index 2158b7e869c5..6dfd6960eabd 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -35,21 +35,33 @@ // Need to generate WHERE clause? if (isset($where_clause)) { + // Yes => rebuild query from scratch; this doesn't work with nested + // selects :-( + $sql_query = 'SELECT '; - $temp_sql_array = explode("where", strtolower($sql_query)); + if (isset($analyzed_sql[0]['queryflags']['distinct'])) { + $sql_query .= ' DISTINCT '; + } + + $sql_query .= $analyzed_sql[0]['select_expr_clause']; + + if (!empty($analyzed_sql[0]['from_clause'])) { + $sql_query .= ' FROM ' . $analyzed_sql[0]['from_clause']; + } - // The fields which is going to select will remain - // as it is regardless of the where clause(s). - // EX :- The part "SELECT `id`, `name` FROM `customers`" - // will remain same when representing the resulted rows - // from the following query, - // "SELECT `id`, `name` FROM `customers` WHERE id NOT IN - // ( SELECT id FROM companies WHERE name LIKE '%u%')" - $sql_query = $temp_sql_array[0]; + $wheres = array(); + + if (isset($where_clause) && is_array($where_clause) + && count($where_clause) > 0) { + $wheres[] = '(' . implode(') OR (', $where_clause) . ')'; + } + + if (!empty($analyzed_sql[0]['where_clause'])) { + $wheres[] = $analyzed_sql[0]['where_clause']; + } - // Append the where clause using the primary key of each row - if (is_array($where_clause) && (count($where_clause) > 0)) { - $sql_query .= ' WHERE (' . implode(') OR (', $where_clause) . ')'; + if (count($wheres) > 0) { + $sql_query .= ' WHERE (' . implode(') AND (', $wheres) . ')'; } if (!empty($analyzed_sql[0]['group_by_clause'])) { From 6b0e05889607942fc99e3cf4accf0ec40d702552 Mon Sep 17 00:00:00 2001 From: Chanaka Indrajith Date: Thu, 1 Nov 2012 23:19:29 +0530 Subject: [PATCH 12/15] Generate correct SQL when export set of resulted rows --- tbl_export.php | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/tbl_export.php b/tbl_export.php index 6dfd6960eabd..2158b7e869c5 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -35,33 +35,21 @@ // Need to generate WHERE clause? if (isset($where_clause)) { - // Yes => rebuild query from scratch; this doesn't work with nested - // selects :-( - $sql_query = 'SELECT '; - if (isset($analyzed_sql[0]['queryflags']['distinct'])) { - $sql_query .= ' DISTINCT '; - } - - $sql_query .= $analyzed_sql[0]['select_expr_clause']; - - if (!empty($analyzed_sql[0]['from_clause'])) { - $sql_query .= ' FROM ' . $analyzed_sql[0]['from_clause']; - } + $temp_sql_array = explode("where", strtolower($sql_query)); - $wheres = array(); - - if (isset($where_clause) && is_array($where_clause) - && count($where_clause) > 0) { - $wheres[] = '(' . implode(') OR (', $where_clause) . ')'; - } - - if (!empty($analyzed_sql[0]['where_clause'])) { - $wheres[] = $analyzed_sql[0]['where_clause']; - } + // The fields which is going to select will remain + // as it is regardless of the where clause(s). + // EX :- The part "SELECT `id`, `name` FROM `customers`" + // will remain same when representing the resulted rows + // from the following query, + // "SELECT `id`, `name` FROM `customers` WHERE id NOT IN + // ( SELECT id FROM companies WHERE name LIKE '%u%')" + $sql_query = $temp_sql_array[0]; - if (count($wheres) > 0) { - $sql_query .= ' WHERE (' . implode(') AND (', $wheres) . ')'; + // Append the where clause using the primary key of each row + if (is_array($where_clause) && (count($where_clause) > 0)) { + $sql_query .= ' WHERE (' . implode(') OR (', $where_clause) . ')'; } if (!empty($analyzed_sql[0]['group_by_clause'])) { From 6dba4654e40064cce7659160a28e32a0add4db4b Mon Sep 17 00:00:00 2001 From: Chanaka Indrajith Date: Thu, 1 Nov 2012 23:27:14 +0530 Subject: [PATCH 13/15] Fix typo --- tbl_export.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tbl_export.php b/tbl_export.php index 2158b7e869c5..a4eb18f80259 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -38,10 +38,10 @@ $temp_sql_array = explode("where", strtolower($sql_query)); - // The fields which is going to select will remain + // The fields which is going to select will be remain // as it is regardless of the where clause(s). // EX :- The part "SELECT `id`, `name` FROM `customers`" - // will remain same when representing the resulted rows + // will be remain same when representing the resulted rows // from the following query, // "SELECT `id`, `name` FROM `customers` WHERE id NOT IN // ( SELECT id FROM companies WHERE name LIKE '%u%')" From 03982728868e514d5bfc9acac4cdff1053d60cd9 Mon Sep 17 00:00:00 2001 From: Israel Torres Date: Thu, 1 Nov 2012 16:53:42 +0100 Subject: [PATCH 14/15] Translated using Weblate. --- po/pt_BR.po | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index c462d7c0cd8f..ed5714602744 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2012-11-01 12:48+0200\n" -"Last-Translator: André Luiz Girol \n" +"PO-Revision-Date: 2012-11-01 16:53+0200\n" +"Last-Translator: Israel Torres \n" "Language-Team: Portuguese (Brazil) " "\n" "Language: pt_BR\n" @@ -12114,6 +12114,9 @@ msgid "" "It is suggested to set {long_query_time} to a lower value, depending on your " "environment. Usually a value of 1-5 seconds is suggested." msgstr "" +"Sugere-se para definir {long_query_time} para um valor inferior, " +"dependendo do seu ambiente. Normalmente, um valor de 1-5 segundos é " +"sugerido." #: po/advisory_rules.php:28 #, php-format From eb0b010b37f46219086166661aa36b83d6e7e26a Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 1 Nov 2012 08:53:47 +0100 Subject: [PATCH 15/15] Translated using Weblate. --- po/tr.po | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/po/tr.po b/po/tr.po index 1159c68d150d..f9c3597df79f 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2012-10-31 19:16+0200\n" +"PO-Revision-Date: 2012-11-01 08:53+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: Turkish \n" "Language: tr\n" @@ -966,11 +966,11 @@ msgstr "" #: import.php:170 import.php:419 msgid "Showing bookmark" -msgstr "Gösterilen işaret" +msgstr "Gösterilen yer imi" #: import.php:180 import.php:415 msgid "The bookmark has been deleted." -msgstr "İşaretleme silindi." +msgstr "Yer imi silindi." #: import.php:291 import.php:344 libraries/File.class.php:457 #: libraries/File.class.php:540 @@ -1012,7 +1012,7 @@ msgstr "İçe aktarma eklentileri yüklenemedi, lütfen kurulumunuzu kontrol edi #: import.php:421 sql.php:933 #, php-format msgid "Bookmark %s created" -msgstr "İşaretleme %s oluşturuldu" +msgstr "Yer imi %s oluşturuldu" #: import.php:427 import.php:433 #, php-format @@ -3409,7 +3409,7 @@ msgid "" "when you're about to lose data" msgstr "" "Veri kaybı yaşamamanız için bir uyarı ("... yapmak istediğiniz için " -"emin misiniz?") görüntülenip görüntülenmeyeceğidir" +"emin misiniz?") görüntülenip görüntülenmemesidir" #: libraries/config/messages.inc.php:47 msgid "Confirm DROP queries" @@ -4181,8 +4181,8 @@ msgid "" "Only light version; display databases in a tree (determined by the separator " "defined below)" msgstr "" -"Sadece sade sürümde; veritabanları ağaç içinde görüntülenir (aşağıda " -"tanımlanan ayıraçlar tarafından belirlenir)" +"Sadece sade sürümde; veritabanlarını bir ağaç içinde görüntüler (aşağıda " +"tanımlanan ayıraç tarafından belirlenir)" #: libraries/config/messages.inc.php:278 msgid "Display databases in a tree" @@ -4346,8 +4346,8 @@ msgstr "Kullanıcılar yüksek değer ayarlayamazlar" #: libraries/config/messages.inc.php:310 msgid "Maximum number of databases displayed in left frame and database list" msgstr "" -"Sol çerçevede ve veritabanı listesinde görüntülenecek olan en fazla " -"veritabanı sayısıdır" +"Sol çerçevede ve veritabanı listesinde görüntülenen en fazla veritabanı " +"sayısıdır" #: libraries/config/messages.inc.php:311 msgid "Maximum databases" @@ -4631,8 +4631,8 @@ msgid "" "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] " "support, suggested: [kbd]pma_bookmark[/kbd]" msgstr "" -"[a@http://wiki.phpmyadmin.net/pma/bookmark]Yer imi[/a] desteği istenmiyorsa " -"boş bırakın, varsayılan: [kbd]pma_bookmark[/kbd]" +"[a@http://wiki.phpmyadmin.net/pma/bookmark]Yer imi[/a] desteği olmaması için " +"boş bırakın, önerilen: [kbd]pma_bookmark[/kbd]" #: libraries/config/messages.inc.php:375 msgid "Bookmark table" @@ -4643,8 +4643,8 @@ msgid "" "Leave blank for no column comments/mime types, suggested: [kbd]" "pma_column_info[/kbd]" msgstr "" -"Sütun yorumları/mime türleri istenmiyorsa boş bırakın, varsayılan: [kbd]" -"pma_column_info[/kbd]" +"Sütun yorumları/mime türleri istenmiyorsa boş bırakın, önerilen: " +"[kbd]pma_column_info[/kbd]" #: libraries/config/messages.inc.php:377 msgid "Column information table" @@ -4709,8 +4709,8 @@ msgid "" "Leave blank for no Designer support, suggested: [kbd]pma_designer_coords[/" "kbd]" msgstr "" -"Tasarımcı desteği istenmiyorsa boş bırakın, varsayılan: [kbd]" -"pma_designer_coords[/kbd]" +"Tasarımcı desteği istenmiyorsa boş bırakın, önerilen: " +"[kbd]pma_designer_coords[/kbd]" #: libraries/config/messages.inc.php:390 msgid "Designer table" @@ -4751,8 +4751,8 @@ msgid "" "Leave blank for no SQL query history support, suggested: [kbd]pma_history[/" "kbd]" msgstr "" -"SQL sorgu geçmişi desteği istenmiyorsa boş bırakın, varsayılan: [kbd]" -"pma_history[/kbd]" +"SQL sorgu geçmişi desteği istenmiyorsa boş bırakın, önerilen: " +"[kbd]pma_history[/kbd]" #: libraries/config/messages.inc.php:398 msgid "SQL query history table" @@ -4821,8 +4821,8 @@ msgstr "Yapılandırma kimlik den. için parola" msgid "" "Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]" msgstr "" -"PDF şeması desteği istenmiyorsa boş bırakın, varsayılan: [kbd]pma_pdf_pages[/" -"kbd]" +"PDF şeması desteği istenmiyorsa boş bırakın, önerilen: " +"[kbd]pma_pdf_pages[/kbd]" #: libraries/config/messages.inc.php:411 msgid "PDF schema: pages table" @@ -4870,7 +4870,7 @@ msgid "" "[/a] support, suggested: [kbd]pma_relation[/kbd]" msgstr "" "[a@http://wiki.phpmyadmin.net/pma/relation]İlişki bağlantıları[/a] desteği " -"istenmiyorsa boş bırakın, varsayılan: [kbd]pma_relation[/kbd]" +"istenmiyorsa boş bırakın, önerilen: [kbd]pma_relation[/kbd]" #: libraries/config/messages.inc.php:419 msgid "Relation table" @@ -4921,8 +4921,8 @@ msgstr "SSL kullan" msgid "" "Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]" msgstr "" -"PDF şeması desteği istenmiyorsa boş bırakın, varsayılan: [kbd]" -"pma_table_coords[/kbd]" +"PDF şeması desteği istenmiyorsa boş bırakın, önerilen: " +"[kbd]pma_table_coords[/kbd]" #: libraries/config/messages.inc.php:430 msgid "PDF schema: table coordinates" @@ -5065,7 +5065,7 @@ msgstr "Bu sunucunun ayrıntılı adı" msgid "Whether a user should be displayed a "show all (rows)" button" msgstr "" "Kullanıcının "tümünü (satırları) göster" düğmesini görüntüleyip " -"görüntüleyemeyeceğidir" +"görüntülememesidir" #: libraries/config/messages.inc.php:456 msgid "Allow to display all the rows" @@ -5270,7 +5270,7 @@ msgstr "Yeni veritabanı adı öner" #: libraries/config/messages.inc.php:497 msgid "A warning is displayed on the main page if Suhosin is detected" -msgstr "Eğer Suhosin algılanırsa, ana sayfada uyarı gösterilir" +msgstr "Eğer Suhosin algılanırsa, ana sayfada bir uyarı görüntülenir" #: libraries/config/messages.inc.php:498 msgid "Suhosin warning" @@ -8058,11 +8058,11 @@ msgstr "Bu SQL sorgusunu işaretle" #: libraries/sql_query_form.lib.php:307 sql.php:984 msgid "Let every user access this bookmark" -msgstr "Bütün kullanıcıların bu işaretlemeye erişimlerine izin ver" +msgstr "Her kullanıcının bu yer imine erişmesine izin ver" #: libraries/sql_query_form.lib.php:313 msgid "Replace existing bookmark of same name" -msgstr "Mevcut aynı ismin işaretlemesini değiştir" +msgstr "Aynı ismin mevcut yer imini değiştir" #: libraries/sql_query_form.lib.php:329 msgid "Do not overwrite this query from outside the window"