From 8358b8c8d35e4e2275cfa68185f355f4c0c101c2 Mon Sep 17 00:00:00 2001 From: ninadsp Date: Thu, 8 Jul 2010 22:53:26 +0530 Subject: [PATCH] Reverted po files changes. --- po/af.po | 1159 ++++++++++++++++---------------------------- po/ar.po | 1167 ++++++++++++++++----------------------------- po/az.po | 1165 ++++++++++++++++----------------------------- po/be.po | 1168 ++++++++++++++++----------------------------- po/be@latin.po | 1170 ++++++++++++++++----------------------------- po/bg.po | 1162 ++++++++++++++++----------------------------- po/bn.po | 1167 ++++++++++++++++----------------------------- po/bs.po | 1165 ++++++++++++++++----------------------------- po/ca.po | 1170 ++++++++++++++++----------------------------- po/cs.po | 1165 ++++++++++++++++----------------------------- po/cy.po | 1163 ++++++++++++++++----------------------------- po/da.po | 1170 ++++++++++++++++----------------------------- po/de.po | 1167 ++++++++++++++++----------------------------- po/el.po | 1170 ++++++++++++++++----------------------------- po/en_GB.po | 1177 ++++++++++++++++----------------------------- po/es.po | 1169 ++++++++++++++++----------------------------- po/et.po | 1168 ++++++++++++++++----------------------------- po/eu.po | 1165 ++++++++++++++++----------------------------- po/fa.po | 1156 ++++++++++++++++---------------------------- po/fi.po | 1170 ++++++++++++++++----------------------------- po/fr.po | 1165 ++++++++++++++++----------------------------- po/gl.po | 1170 ++++++++++++++++----------------------------- po/he.po | 1167 ++++++++++++++++----------------------------- po/hi.po | 1161 ++++++++++++++++----------------------------- po/hr.po | 1168 ++++++++++++++++----------------------------- po/hu.po | 1169 ++++++++++++++++----------------------------- po/id.po | 1172 ++++++++++++++++----------------------------- po/it.po | 1166 ++++++++++++++++----------------------------- po/ja.po | 1170 ++++++++++++++++----------------------------- po/ka.po | 1169 ++++++++++++++++----------------------------- po/ko.po | 1214 +++++++++++++++-------------------------------- po/lt.po | 1168 ++++++++++++++++----------------------------- po/lv.po | 1167 ++++++++++++++++----------------------------- po/mk.po | 1166 ++++++++++++++++----------------------------- po/mn.po | 1170 ++++++++++++++++----------------------------- po/ms.po | 1161 ++++++++++++++++----------------------------- po/nb.po | 1165 ++++++++++++++++----------------------------- po/nl.po | 1167 ++++++++++++++++----------------------------- po/pl.po | 1169 ++++++++++++++++----------------------------- po/pt.po | 1165 ++++++++++++++++----------------------------- po/pt_BR.po | 1168 ++++++++++++++++----------------------------- po/ro.po | 1165 ++++++++++++++++----------------------------- po/ru.po | 1170 ++++++++++++++++----------------------------- po/si.po | 1167 ++++++++++++++++----------------------------- po/sk.po | 1168 ++++++++++++++++----------------------------- po/sl.po | 1165 ++++++++++++++++----------------------------- po/sq.po | 1164 ++++++++++++++++----------------------------- po/sr.po | 1168 ++++++++++++++++----------------------------- po/sr@latin.po | 1168 ++++++++++++++++----------------------------- po/sv.po | 1169 ++++++++++++++++----------------------------- po/ta.po | 1145 ++++++++++++++++---------------------------- po/te.po | 1169 ++++++++++++++++----------------------------- po/th.po | 1166 ++++++++++++++++----------------------------- po/tr.po | 1239 ++++++++++++++---------------------------------- po/tt.po | 1179 ++++++++++++++++----------------------------- po/uk.po | 1167 ++++++++++++++++----------------------------- po/ur.po | 1155 ++++++++++++++++---------------------------- po/uz.po | 1170 ++++++++++++++++----------------------------- po/uz@latin.po | 1170 ++++++++++++++++----------------------------- po/zh_CN.po | 1165 ++++++++++++++++----------------------------- po/zh_TW.po | 1167 ++++++++++++++++----------------------------- 61 files changed, 24800 insertions(+), 46486 deletions(-) mode change 100755 => 100644 po/af.po mode change 100755 => 100644 po/ar.po mode change 100755 => 100644 po/az.po mode change 100755 => 100644 po/be.po mode change 100755 => 100644 po/be@latin.po mode change 100755 => 100644 po/bg.po mode change 100755 => 100644 po/bn.po mode change 100755 => 100644 po/bs.po mode change 100755 => 100644 po/ca.po mode change 100755 => 100644 po/cs.po mode change 100755 => 100644 po/da.po mode change 100755 => 100644 po/de.po mode change 100755 => 100644 po/el.po mode change 100755 => 100644 po/en_GB.po mode change 100755 => 100644 po/es.po mode change 100755 => 100644 po/et.po mode change 100755 => 100644 po/eu.po mode change 100755 => 100644 po/fa.po mode change 100755 => 100644 po/fi.po mode change 100755 => 100644 po/fr.po mode change 100755 => 100644 po/gl.po mode change 100755 => 100644 po/he.po mode change 100755 => 100644 po/hi.po mode change 100755 => 100644 po/hr.po mode change 100755 => 100644 po/hu.po mode change 100755 => 100644 po/id.po mode change 100755 => 100644 po/it.po mode change 100755 => 100644 po/ja.po mode change 100755 => 100644 po/ka.po mode change 100755 => 100644 po/ko.po mode change 100755 => 100644 po/lt.po mode change 100755 => 100644 po/lv.po mode change 100755 => 100644 po/mk.po mode change 100755 => 100644 po/mn.po mode change 100755 => 100644 po/ms.po mode change 100755 => 100644 po/nb.po mode change 100755 => 100644 po/nl.po mode change 100755 => 100644 po/pl.po mode change 100755 => 100644 po/pt.po mode change 100755 => 100644 po/pt_BR.po mode change 100755 => 100644 po/ro.po mode change 100755 => 100644 po/ru.po mode change 100755 => 100644 po/si.po mode change 100755 => 100644 po/sk.po mode change 100755 => 100644 po/sl.po mode change 100755 => 100644 po/sq.po mode change 100755 => 100644 po/sr.po mode change 100755 => 100644 po/sr@latin.po mode change 100755 => 100644 po/sv.po mode change 100755 => 100644 po/ta.po mode change 100755 => 100644 po/te.po mode change 100755 => 100644 po/th.po mode change 100755 => 100644 po/tr.po mode change 100755 => 100644 po/tt.po mode change 100755 => 100644 po/uk.po mode change 100755 => 100644 po/ur.po mode change 100755 => 100644 po/uz.po mode change 100755 => 100644 po/uz@latin.po mode change 100755 => 100644 po/zh_CN.po mode change 100755 => 100644 po/zh_TW.po diff --git a/po/af.po b/po/af.po old mode 100755 new mode 100644 index 52fabddce..ad780f62c --- a/po/af.po +++ b/po/af.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-30 23:04+0200\n" "Last-Translator: Michal \n" "Language-Team: afrikaans \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Wys alles" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -39,53 +35,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Soek" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Gaan" @@ -112,7 +92,7 @@ msgstr "" msgid "Database %1$s has been created." msgstr "Databasis %s is verwyder." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 #, fuzzy msgid "Database comment: " msgstr "Tabel kommentaar" @@ -140,17 +120,10 @@ msgstr "Kolom name" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Tipe" @@ -163,7 +136,7 @@ msgstr "Tipe" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -187,24 +160,18 @@ msgstr "Skakels na" msgid "Comments" msgstr "Kommentaar" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Nee" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -213,15 +180,9 @@ msgstr "Nee" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -240,146 +201,138 @@ msgstr "Sien die storting (skema) van die databasis" msgid "No tables found in database." msgstr "Geen tabelle in databasis gevind nie." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Kies Alles" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Selekteer Niks" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 #, fuzzy msgid "The database name is empty!" msgstr "Die tabel naam is leeg!" -#: db_operations.php:241 +#: db_operations.php:236 #, fuzzy, php-format msgid "Database %s has been renamed to %s" msgstr "Tabel %s is vernoem na %s" -#: db_operations.php:245 +#: db_operations.php:240 #, fuzzy, php-format msgid "Database %s has been copied to %s" msgstr "Tabel %s is gekopieer na %s." -#: db_operations.php:423 +#: db_operations.php:412 #, fuzzy msgid "Rename database to" msgstr "Hernoem tabel na" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 #, fuzzy msgid "Command" msgstr "Kommentaar" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "" #: db_operations.php:455 ->>>>>>> origin/master #, fuzzy msgid "Copy database to" msgstr "Geen databasisse" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Slegs struktuur" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Struktuur en data" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Slegs Data" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Beskikbaar" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "Onbeskikbaar" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "Herstel tabel" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Onbeskikbaar" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "Beskikbaar" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -388,14 +341,14 @@ msgstr "" "Die addisionele funksies om met geskakelde tabelle te werk is ge deaktiveer. " "Om uit te vind hoekom kliek %shier%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Verander PDF Bladsye" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -404,11 +357,7 @@ msgstr "Tabel" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Rye" @@ -416,43 +365,31 @@ msgstr "Rye" msgid "Size" msgstr "Grootte" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "in gebruik" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master #, fuzzy msgid "Creation" msgstr "Skep" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -513,11 +450,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Of" @@ -551,85 +484,85 @@ msgstr "Gebruik Tabelle" msgid "SQL query on database %s:" msgstr "SQL-navraag op databasis %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Doen Navraag" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Toegang Geweier" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "ten minste een van die woorde" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "alle woorde" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "die presiese frase" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "as 'n regular expression" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Soek resultate vir \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s resultate binne tabel %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Beloer Data" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Verwyder" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Totaal: %s ooreenkomste" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Soek in databasis" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Woord(e) of waarde(s) om voor te soek (wildcard: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Vind:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Woorde is geskei dmv 'n spasie karakter (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Binne tabel(le):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -637,36 +570,36 @@ msgstr "Binne tabel(le):" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Voeg by" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Struktuur" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Verwyder" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Maak Leeg" @@ -676,117 +609,111 @@ msgstr "Maak Leeg" msgid "Table %s has been emptied" msgstr "Tabel %s is leeg gemaak" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, fuzzy, php-format msgid "View %s has been dropped" msgstr "Veld %s is verwyder" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Tabel %s is verwyder" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Som" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "" -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Met gekose:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Kies Alles" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Kies Niks" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Drukker mooi (print view)" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Kontroleer tabel" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimaliseer tabel" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Herstel tabel" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analiseer tabel" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Export" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "" @@ -797,10 +724,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -821,8 +748,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Aksie" @@ -858,8 +785,8 @@ msgstr "Slegs struktuur" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Kontroleer tabel" @@ -934,7 +861,7 @@ msgstr "Die boekmerk is verwyder." msgid "Showing bookmark" msgstr "" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "" @@ -1013,285 +940,188 @@ msgstr "Die gasheer naam is leeg!" msgid "The user name is empty!" msgstr "Die gebruiker naam ontbreek!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Die wagwoord is leeg!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Die wagwoorde is verskillend!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Voeg 'n nuwe gebruiker by" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Bediener weergawe" - -#: js/messages.php:48 -#, fuzzy -msgid "Reloading Privileges" -msgstr "Geen Regte" - -#: js/messages.php:49 -msgid "Removing Selected Users" -msgstr "" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Local" - -#: js/messages.php:58 -msgid "Processing Request" -msgstr "" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -msgid "Renaming Databases" -msgstr "Hernoem tabel na" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Databasis" - -#: js/messages.php:67 -#, fuzzy -msgid "Copying Database" -msgstr "Geen databasisse" - -#: js/messages.php:68 -msgid "Changing Charset" -msgstr "" - -#: js/messages.php:69 -#, fuzzy -#| msgid "You have to choose at least one column to display" -msgid "Table must have atleast 1 column" -msgstr "Jy moet ten minste een Kolom kies om te vertoon" - -#: js/messages.php:70 -#, fuzzy -msgid "Create Table" -msgstr "Skep 'n nuwe bladsy" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Soek" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Veranderinge is gestoor" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 #, fuzzy msgid "Relation deleted" msgstr "Relasie uitsig" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 #, fuzzy msgid "Internal relation added" msgstr "Algemene verwantskap funksies" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Algemene verwantskap funksies" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Onbeskikbaar" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Kies 'n Veld om te vertoon" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "Geen" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Vorige" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Volgende" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy msgid "Today" msgstr "totaal" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Biner" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Mar" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Apr" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Mei" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Jun" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Jul" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Aug" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Okt" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Jan" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Feb" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Apr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1299,176 +1129,176 @@ msgid "May" msgstr "Mei" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Jun" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Jul" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Aug" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Sep" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Okt" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Nov" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Des" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "So" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Ma" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Di" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Fr" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "So" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Ma" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Di" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Wo" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Do" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Fr" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sa" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "So" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Ma" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Di" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Wo" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Do" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Fr" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Sa" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "in gebruik" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "Records" msgid "Second" @@ -1525,7 +1355,7 @@ msgstr "Indekse" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Uniek" @@ -1544,7 +1374,7 @@ msgid "Comment" msgstr "Kommentaar" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1567,8 +1397,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "databasisse" @@ -1730,11 +1560,7 @@ msgstr "Wagwoord:" msgid "Server Choice" msgstr "Bediener Keuse" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "HTTP Koekies moet van nou af geaktifeer wees." @@ -1814,11 +1640,7 @@ msgstr "" "Kan nie iconv, libiconv of recode_string funksie gebruik terwyl die extensie " "homself as gelaai rapporteer nie. Kyk na jou PHP opstelling." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Indien jy 'n bladsy kry wat leeg is, " "is alles klopdisselboom." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1855,47 +1669,27 @@ msgstr "" "Die $cfg['PmaAbsoluteUri'] veranderlike MOET gestel wees in jou " "konfigurasie leer!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "" @@ -1921,7 +1715,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentasie" @@ -1935,136 +1729,136 @@ msgstr "SQL-stelling" msgid "MySQL said: " msgstr "MySQL het gepraat: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Verduidelik SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Ignoreer SQL Verduideliking" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "Sonder PHP Kode" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Skep PHP Kode" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Ignoreer SQL Validasie" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Valideer SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Bytes" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%B %d, %Y at %I:%M %p" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s days, %s hours, %s minutes and %s seconds" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Begin" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Vorige" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Einde" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "" -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2083,7 +1877,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Naam" @@ -2111,16 +1905,16 @@ msgstr "Navraag dmv Voorbeeld" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 #, fuzzy msgid "Import" msgstr "Export" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Regte" @@ -2139,11 +1933,7 @@ msgid "" msgstr "" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Overhead" @@ -2160,7 +1950,7 @@ msgstr "" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2170,36 +1960,22 @@ msgid "Change password" msgstr "Verander wagwoord" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Geen Wagwoord" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Wagwoord" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Tik weer" @@ -2212,20 +1988,12 @@ msgid "MySQL 4.0 compatible" msgstr "" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master #, fuzzy msgid "Generate" msgstr "Voortgebring deur" @@ -2239,17 +2007,23 @@ msgstr "Skep 'n nuwe databasis" msgid "Create" msgstr "Skep" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Geen Regte" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "You have to choose at least one column to display" +msgid "Table must have at least one column." +msgstr "Jy moet ten minste een Kolom kies om te vertoon" + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Skep 'n nuwe tabel op databasis %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of rows per page" msgid "Number of columns" @@ -2312,11 +2086,7 @@ msgid "remember template" msgstr "" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Karakterstel van die leer:" @@ -2327,7 +2097,7 @@ msgstr "" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Geen" @@ -2369,11 +2139,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Soek die teksleer" @@ -2381,20 +2147,12 @@ msgstr "Soek die teksleer" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "" @@ -2523,11 +2281,7 @@ msgstr "" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "Operasies" @@ -2598,14 +2352,14 @@ msgstr "Vertoon rye" msgid "total" msgstr "totaal" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Verander" @@ -2673,11 +2427,7 @@ msgstr "" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master #, fuzzy msgid "Total" msgstr "totaal" @@ -2924,11 +2674,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Formaat" @@ -2998,13 +2744,8 @@ msgstr "" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Data" @@ -3055,15 +2796,9 @@ msgstr "" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Gasheer (host)" @@ -3261,7 +2996,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Geen tabelle" @@ -3274,7 +3009,7 @@ msgstr "SQL resultaat" msgid "Generated by" msgstr "Voortgebring deur" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL het niks teruggegee nie (dus nul rye)." @@ -3421,20 +3156,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primere" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Indeks" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Volteks" @@ -3659,6 +3394,10 @@ msgstr "" msgid "not OK" msgstr "nie OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Beskikbaar" @@ -3680,7 +3419,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Geboekmerkde SQL-stelling" @@ -3731,13 +3470,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Gebruiker naam" @@ -3755,22 +3489,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Waarde" @@ -3788,40 +3514,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Enige gebruiker" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Enige gasheer (host)" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Local" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3845,7 +3542,6 @@ msgid "Use Host Table" msgstr "" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3879,30 +3575,30 @@ msgstr "" msgid "Servers" msgstr "" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 #, fuzzy msgid "Binary log" msgstr "Biner" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3931,51 +3627,51 @@ msgstr "" msgid "Target database" msgstr "Soek in databasis" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, fuzzy, php-format msgid "Run SQL query/queries on server %s" msgstr "Hardloop SQL stellings op databasis %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Hardloop SQL stellings op databasis %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Kolom name" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Boekmerk hierdie SQL-stelling" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Wys hierdie navraag weer hier " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Stuur" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Kyk slegs" @@ -4148,12 +3844,12 @@ msgstr "" msgid "Save" msgstr "Stoor" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format msgid "Add %s column(s)" msgstr "Voeg 'n nuwe veld by" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to add at least one column." @@ -4288,8 +3984,8 @@ msgstr "Herstel" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Gebruiker" @@ -4718,111 +4414,111 @@ msgstr "" msgid "View dump (schema) of databases" msgstr "Sien die storting (skema) van die databasis" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "" -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "" -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "" -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "" -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "" -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "" -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "" -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "" -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "" -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "" -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "" -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "" -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "" -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "" -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "" -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Limits the number of new connections the user may open per hour." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Limits the number of queries the user may send to the server per hour." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4830,218 +4526,218 @@ msgstr "" "Limits the number of commands that change any table or database the user may " "execute per hour." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 #, fuzzy msgid "Limits the number of simultaneous connections the user may have." msgstr "Limits the number of new connections the user may open per hour." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "" -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "" -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "" -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "" -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "" -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " "killing threads of other users." msgstr "" -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "" -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 #, fuzzy msgid "No privileges." msgstr "Geen Regte" -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Geen" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Nota: MySQL regte name word in Engels vertoon " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 #, fuzzy msgid "Global privileges" msgstr "Geen Regte" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" -#: server_privileges.php:709 +#: server_privileges.php:708 #, fuzzy msgid "Login Information" msgstr "Wys PHP informasie" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Moenie die wagwoord verander nie" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Geen gebruiker(s) gevind nie." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Jy het 'n nuwe gebruiker bygevoeg." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Jy het die regte opgedateer vir %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Jy het die regte herroep vir %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "" -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "" -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "" -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Verander Regte" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Herroep" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Enige" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Voeg 'n nuwe gebruiker by" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "" -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5050,91 +4746,91 @@ msgid "" "sreload the privileges%s before you continue." msgstr "" -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "" -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "" -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "" -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr "" -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Geen" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "" @@ -7739,25 +7435,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Etiket" @@ -7810,13 +7506,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Terug na vorige bladsy" @@ -7898,7 +7587,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Voeg by indeks  %s kolom(me)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -8014,41 +7703,6 @@ msgstr "Toets referential integrity:" msgid "Show tables" msgstr "Wys tabelle" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Spasie verbruik" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Gebruik" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Effektief" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Ry Statistiek" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Stellings" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinamies" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Ry lengte" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Spasie verbruik" @@ -8082,7 +7736,6 @@ msgid "Row length" msgstr "Ry lengte" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Ry grootte " @@ -8154,49 +7807,49 @@ msgstr "Geen" msgid "Column %s has been dropped" msgstr "Tabel %s is verwyder" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "'n primere sleutel is bygevoeg op %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "'n Indeks is bygevoeg op %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Relasie uitsig" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Stel tabel struktuur voor" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy msgid "Add column" msgstr "Voeg 'n nuwe veld by" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "By Einde van Tabel" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "By Begin van Tabel" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Na %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Skep 'n indeks op %s kolomme" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8238,6 +7891,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8531,6 +8188,10 @@ msgstr "Hernoem tabel na" #~ msgid "has been altered." #~ msgstr "is verander." +#, fuzzy +#~ msgid "Reload privileges" +#~ msgstr "Geen Regte" + #, fuzzy #~| msgid "Select All" #~ msgctxt "Create SELECT * query" diff --git a/po/ar.po b/po/ar.po old mode 100755 new mode 100644 index 5da458799..7fcf219ba --- a/po/ar.po +++ b/po/ar.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-05-29 14:16+0200\n" "Last-Translator: Ahmed \n" "Language-Team: arabic \n" @@ -20,11 +16,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "شاهد الكل" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "ابحث" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr " تنفيذ " @@ -114,7 +94,7 @@ msgstr "استخدم هذه القيمة" msgid "Database %1$s has been created." msgstr "" -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "ملاحظة قاعدة البيانات: " @@ -141,17 +121,10 @@ msgstr "اسم العمود" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "النوع" @@ -164,7 +137,7 @@ msgstr "النوع" msgid "Null" msgstr "خالي" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -188,24 +161,18 @@ msgstr "مرتبط بـ" msgid "Comments" msgstr "تعليقات" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "لا" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -214,15 +181,9 @@ msgstr "لا" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -241,141 +202,133 @@ msgstr "عرض بنية قاعدة البيانات" msgid "No tables found in database." msgstr "لا توجد جداول متوفره في قاعدة البيانات هذه!." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "تحديد الكل" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "إلغاء تحديد الكل" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "إسم قاعدة البيانات خالي!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "تم إعادة تسمية قاعدة البيانات %s إلى %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "تم نسخ قاعدة البيانات %s إلى %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "أعد تسمية قاعدة البيانات ﺇﻠﻰ" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "أمر" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "وبعدها" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "إنسخ قاعدة البيانات إلى" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "البنية فقط" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "البنية والبيانات" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "بيانات فقط" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREATE DATABASE قبل النسخ" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "أضف %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "أضف قيمة AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "أضف قيودا" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "وضع" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "مفعل" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "عطل" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair" msgctxt "BLOB repository" msgid "Repair" msgstr "صلح" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "معطل" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "فعل" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Collation" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -384,14 +337,14 @@ msgstr "" "تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط %sهنا%" "s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "عدل صفحات PDF" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -400,11 +353,7 @@ msgstr "الجدول" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "صفوف" @@ -412,42 +361,30 @@ msgstr "صفوف" msgid "Size" msgstr "الحجم" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "قيد الإستعمال" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "الإنشاء" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "التحديث الأخير" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "التحقق الأخير" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -508,11 +445,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "أو" @@ -546,85 +479,85 @@ msgstr "استخدم الجدول" msgid "SQL query on database %s:" msgstr "في قاعدة البيانات SQL-إستعلام %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "إرسال الاستعلام" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "غير مسموح" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "على الأقل أحد الكلمات" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "كل الكلمات" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "الجملة بالضبط" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "كصيغة مطابقة" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "ابحث في النتائج عن \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s مطابقة في الجدول %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "استعراض" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "حذف" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "المجموع: %sمطابقة" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "ابحث في قاعدة البيانات" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "الكلمات أو القيم المطلوب البحث عنها (wildcard: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "ابحث:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "الكلمات مفصولة بحرف مسافة (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "داخل الجدول)الجداول(:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -632,36 +565,36 @@ msgstr "داخل الجدول)الجداول(:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "إدخال" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "بناء" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "حذف" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "إفراغ محتوى" @@ -671,117 +604,111 @@ msgstr "إفراغ محتوى" msgid "Table %s has been emptied" msgstr "جدول %s أفرغت محتوياتها" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "جدول %s حذفت" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "المجموع" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "" -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr ": على المحدد" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "اختر الكل" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "إلغاء تحديد الكل" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "تحقق من overhead" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "عرض نسخة للطباعة" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "التحقق من الجدول" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "ضغط الجدول" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "إصلاح الجدول" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "تحليل الجدول" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "تصدير" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "قاموس البيانات" @@ -792,10 +719,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -815,8 +742,8 @@ msgstr "محدث" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "العملية" @@ -850,8 +777,8 @@ msgstr "" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "" @@ -926,7 +853,7 @@ msgstr "لقد حذفت العلامة المرجعية." msgid "Showing bookmark" msgstr "" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "تم إنشاء العلامة المرجعية %s" @@ -1005,294 +932,185 @@ msgstr "اسم المستضيف فارغ!" msgid "The user name is empty!" msgstr "اسم المستخدم فارغ!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "كلمة السر فارغة !" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "كلمتا السر غير متشابهتان !" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "أضف مستخدم جديد" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create" -msgid "Create User" -msgstr "تكوين" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reloading the privileges" -msgid "Reloading Privileges" -msgstr "قيد إعادة قراءة الصلاحيات." - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "احذف المستخدمين المحددين" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "أغلق" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "ألغ" -#: js/messages.php:57 -#, fuzzy -#| msgid "Log in" -msgid "Loading" -msgstr "دخول" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "معالَجات" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "موافق" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "أعد تسمية قاعدة البيانات ﺇﻠﻰ" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "قاعدة البيانات" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "إنسخ قاعدة البيانات إلى" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "مجموعة المحارف" - -#: js/messages.php:69 -#, fuzzy -#| msgid "You have to choose at least one column to display" -msgid "Table must have atleast 1 column" -msgstr "عليك اختيار عمود واحد على الأقل للعرض" - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "أنشئ الجدول" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "ابحث" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "تمت التعديلات" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "المزايا العامّة للرابط" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "معطل" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "اختر الحقل لإظهاره" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "Donate" msgid "Done" msgstr "تبرع" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "سابق" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "التالي" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "مجموع كلي" -#: js/messages.php:111 +#: js/messages.php:82 msgid "January" msgstr "يناير" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "فبراير" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "مارس" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "أبريل" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "مايو" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "يونيو" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "يوليو" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "أغسطس" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "سبتمبر" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "أكتوبر" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "نوفمبر" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "ديسمبر" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "يناير" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "فبراير" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "مارس" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "أبريل" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1300,174 +1118,174 @@ msgid "May" msgstr "مايو" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "يونيو" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "يوليو" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "أغسطس" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "سبتمبر" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "أكتوبر" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "نوفمبر" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "ديسمبر" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "الأحد" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "الإثنين" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "الثلاثاء" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "الأربعاء" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "الخميس" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "الجمعة" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "السبت" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "الأحد" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "الإثنين" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "الثلاثاء" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "الأربعاء" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "الخميس" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "الجمعة" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "السبت" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "الأحد" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "الإثنين" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "الثلاثاء" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "الأربعاء" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "الخميس" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "الجمعة" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "السبت" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "الأسبوع" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "الساعة" -#: js/messages.php:194 +#: js/messages.php:165 msgid "Minute" msgstr "الدقيقة" -#: js/messages.php:195 +#: js/messages.php:166 msgid "Second" msgstr "الثانية" @@ -1522,7 +1340,7 @@ msgstr "فهارس" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "مميز" @@ -1540,7 +1358,7 @@ msgid "Comment" msgstr "تعليق" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1563,8 +1381,8 @@ msgid "" "removed." msgstr "الفهارس %1$s و %2$s متساويان ويمكن حذف أحدهما." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "قاعدة بيانات" @@ -1729,11 +1547,7 @@ msgstr "كلمة السر:" msgid "Server Choice" msgstr "اختيار الخادم" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "يجب تفعيل دعم الكوكيز في هذه المرحلة." @@ -1813,11 +1627,7 @@ msgstr "" "لا يمكن استخدام iconv ولا libiconv ولا عملية recode_string في حين يحدد " "الامتداد أنه محمل. تأكد من إعدادات PHP." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
إن حصلت " "على صفحة فارغة، فكل شيء على ما يرام." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1853,47 +1655,27 @@ msgstr "" "المتغير $cfg['PmaAbsoluteUri'] يجب تعديله " "في ملف التعريف !" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "فهرس خادم غير صحيح: %s" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "خادم" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "عليك التحديث إلى %s %s أو لاحقا." @@ -1919,7 +1701,7 @@ msgstr "" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "مستندات وثائقية" @@ -1933,136 +1715,136 @@ msgstr "استعلام-SQL" msgid "MySQL said: " msgstr "MySQL قال: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "اشرح SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "تخطي شرح SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "بدون كود PHP" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "أنشئ كود PHP" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "حدث" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "تخطي التأكد من SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "التحقق من استعلام SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "وقت" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "بايت" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "كيلوبايت" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "ميجابايت" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "جيجابايت" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "تيرابايت" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "بيتابايت" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "إكسابايت" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d %B %Y الساعة %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s يوم، %s ساعة، %s دقيقة و%s ثانية" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "بداية" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "سابق" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "نهاية" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "إذهب إلى قاعدة بيانات "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2081,7 +1863,7 @@ msgid "Events" msgstr "أحداث" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "الاسم" @@ -2109,15 +1891,15 @@ msgstr "استعلام بواسطة مثال" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "استورد" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "الإمتيازات" @@ -2136,11 +1918,7 @@ msgid "" msgstr "" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "الفوقي" @@ -2157,7 +1935,7 @@ msgstr "" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2167,36 +1945,22 @@ msgid "Change password" msgstr "تغيير كلمة السر" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "لا كلمة سر" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "كلمة السر" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "أعد كتابة" @@ -2209,20 +1973,12 @@ msgid "MySQL 4.0 compatible" msgstr "" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "ولد" @@ -2235,17 +1991,23 @@ msgstr "تكوين قاعدة بيانات جديدة" msgid "Create" msgstr "تكوين" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "امتياز غير موجود" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "You have to choose at least one column to display" +msgid "Table must have at least one column." +msgstr "عليك اختيار عمود واحد على الأقل للعرض" + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "تكوين جدول جديد في قاعدة البيانات %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of tables" msgid "Number of columns" @@ -2307,11 +2069,7 @@ msgid "remember template" msgstr "تذكر القالب" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "شيفرة أحرف الملف:" @@ -2322,7 +2080,7 @@ msgstr "الضغط" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "لا شيء" @@ -2364,11 +2122,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "مكان ملف نصي" @@ -2376,20 +2130,12 @@ msgstr "مكان ملف نصي" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "الدليل الذي حددته لتحميل عملك لا يمكن الوصول إليه." -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "دليل تحميل الملفات على خادم الشبكة" @@ -2518,11 +2264,7 @@ msgstr "رتب حسب المفتاح" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "خيارات" @@ -2592,14 +2334,14 @@ msgstr "مشاهدة السجلات " msgid "total" msgstr "المجموع" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "استغرق الاستعلام %01.4f ثانية" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "تغيير" @@ -2665,11 +2407,7 @@ msgstr "" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "مجموع كلي" @@ -2914,11 +2652,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "صيغة" @@ -2990,13 +2724,8 @@ msgstr "" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "بيانات" @@ -3045,15 +2774,9 @@ msgstr "نوع MIME" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "المزود" @@ -3248,7 +2971,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "" @@ -3260,7 +2983,7 @@ msgstr "ناتج استعلام SQL" msgid "Generated by" msgstr "أنشئ بواسطة" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL قام بإرجاع نتيجة إعداد فارغه (مثلا صف صفري)." @@ -3405,20 +3128,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "أساسي" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "فهرست" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "النص كاملا" @@ -3643,6 +3366,10 @@ msgstr "هذا التنسيق ليس له أي خيارات" msgid "not OK" msgstr "ليس صالحا" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "موافق" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "مفعل" @@ -3664,7 +3391,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "رجاء راجع التوثيق لكيفية تحديث جدول Column_comments." -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "علامة مرجعية SQL-استعلام" @@ -3715,13 +3442,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "اسم المستخدم" @@ -3738,22 +3460,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "متغير" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "القيمة" @@ -3771,40 +3485,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "أي مستخدم" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "استخدم حقل نص" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "أي مزود" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "محلي" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "هذا المضيف" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "استخدم الجدول المضيف" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3828,7 +3513,6 @@ msgid "Use Host Table" msgstr "استخدم الجدول المضيف" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3862,29 +3546,29 @@ msgstr "" msgid "Servers" msgstr "خوادم" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "متغيرات" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "مجموعات المحارف" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "محركات" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "سجل ثنائي" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "معالَجات" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3911,51 +3595,51 @@ msgstr "فرق" msgid "Target database" msgstr "" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "تنفيذ استعلام/استعلامات SQL على قاعدة بيانات %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "اسم العمود" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "اجعل علامة مرجعية SQL-استعلام" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "اسمح لكل المستخدمين الوصول إلى هذه العلامة المرجعية" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "لا تخزن على هذا الاستعلام من خارج النافذة" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " عرض هذا الاستعلام هنا مرة أخرى " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "إرسال" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "عرض فقط" @@ -4127,13 +3811,13 @@ msgstr "" msgid "Save" msgstr "حفظ" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add into comments" msgid "Add %s column(s)" msgstr "أضف إلى الملاحظات" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to add at least one column." @@ -4312,8 +3996,8 @@ msgstr "إلغاء" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "المستخدم" @@ -4741,111 +4425,111 @@ msgstr "" msgid "View dump (schema) of databases" msgstr "اعرض أو احفظ بناء قواعد البيانات." -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "يتضمن كل الصلاحيات عدا GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "يسمح بتعديل بناء الجداول الموجودة مسبقا." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "" -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "يسمح بإنشاء قواعد بيانات وجداول جديدة." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "" -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "يسمح بإنشاء جداول جديدة." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "يسمح بإنشاء جداول مؤقتة." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "" -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "يسمح بحذف البيانات." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "يسمح بحذف قواعد البيانات." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "يسمح بحذف الجداول." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "يسمح باستيراد وتصدير البيانات من وإلى الملفّات." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "يسمح بإضافة المستخدمين والصلاحيات دون إعادة قراءة جداول الصلاحيات." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "يسمح بإنشاء وحذف الفهارس." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "يسمح بإضافة واستبدال البيانات." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "يسمح بقفل الجداول للعملية الحالية." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "يحد من عدد الاتصالات الجديدة التي يمكن للمستخدم فتحها بكل ساعة." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "يحد عدد الاستعلامات التي يستطيع المستخدم إرسالها إلى الخادم بكل ساعة." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4853,58 +4537,58 @@ msgstr "" "يحد عدد الأوامر التي ينفذها المستخدم بكل ساعة، والتي تغير أي جدول أو قاعدة " "بيانات." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "" -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "ليس له أي تأثير في نسخة MySQL الحالية." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "يسمح بإعادة تحميل إعدادات الخادم وتفريغ كاش الخادم." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "يعطي الحق للمستخدم بالسؤال عن مكان وجود slaves/masters." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "مطلوب لتوابع لاستنساخ." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "يسمح بقراءة البيانات." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "يسمح بالوصول لقائمة أسماء جميع قواعد البيانات." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "يسمح بإيقاف عمل الخادم." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -4913,156 +4597,156 @@ msgstr "" "يسمح بالاتصال، حتى لو وصل حد عدد الاتصالات للأقصى.، مطلوب للمهام الإدارية " "كضبط الإعدادات العامة other users." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "يسمح بتعديل البيانات." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "لا صلاحيات." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "لا شيء" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "صلاحيات خاصة بالجدول" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " ملاحظه: اسم الامتياز لـMySQL يظهر ويقرأ باللغة الإنجليزية فقط " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "صلاحيات عامة" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "صلاحيات خاصة بقاعدة البيانات" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "إدارة" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "حدود المصادر" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "ملاحظة: تغيير هذه الخيارات للرقم 0 )صفر( يلغي الحد." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "بيانات الدخول" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "لاتغير كلمة السر" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "المستخدم(ون) لم يتم إيجادهم." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "اسم المستخدم %s موجود مسبقاً!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "لقد أضفت مستخدم جديد." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "لقد جددت وحدثت الإمتيازات لـ %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "لقد أبطلت الامتيازات لـ %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "تم تغيير كلمة المرور لـ %s بنجاح." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "قيد حذف %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "قيد إعادة قراءة الصلاحيات." -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "تم حذف المستخدمين المحددين بنجاح." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "تم إعادة قراءة الصلاحيات بنجاح." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "تحرير الامتيازات" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "إبطال" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "معلومات المستخدم" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "منح" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "أي" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "أضف مستخدم جديد" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "احذف المستخدمين المحددين" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "استرجع كل الصلاحيات الفعالة من المستخدمين ثم احذفهم بعد ذلك." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "احذف قواعد البيانات التي لها نفس أسماء المستخدمين." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5075,91 +4759,91 @@ msgstr "" "ما تم التعديل عليها يدويا. في هذه الحالة، عليك %s بإعادة قراءة الصلاحيات %s " "قبل أن تكمل." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "المستخدم المحدد غير موجود في جدول الصلاحيات." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "صلاحيات خاصة بالحقل" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "إضافة الصلاحيات على قاعدة البيانات التالية" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "إضافة الصلاحيات على الجدول التالي" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "غير معلومات الدخول / انسخ اسم مستخدم" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "أضف اسم مستخدم جديد بنفس الصلاحيات و..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr " ... أبق القديم." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... احذف القديم من جداول المستخدمين." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... استعد كل الصلاحيات الفعالة من القديم واحذهم بعد ذلك." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr " ... احذف القديم من جداول المستخدمين وأعد قراءة الصلاحيات بعد ذلك." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "لا شيء" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "المستخدمين ذوي صلاحية الوصول إلى "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "عام" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "خاص بقاعدة بيانات" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "حرف شامل" @@ -7739,25 +7423,25 @@ msgstr "" msgid "ZIP" msgstr "زيب" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "علامة" @@ -7809,13 +7493,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "وبعدها" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "الرجوع إلى الصفحة السابقة" @@ -7895,7 +7572,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "إضافه كفهرس  %s صف(ـوف)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -8009,41 +7686,6 @@ msgstr "تحديد التكامل المرجعي:" msgid "Show tables" msgstr "شاهد الجدول" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "المساحة المستغلة" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "المساحة" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "فعال" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "إحصائيات" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "أوامر" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "ديناميكي" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "طول الصف" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "المساحة المستغلة" @@ -8077,7 +7719,6 @@ msgid "Row length" msgstr "طول الصف" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " مقاس الصف " @@ -8149,50 +7790,50 @@ msgstr "لا شيء" msgid "Column %s has been dropped" msgstr "جدول %s حذفت" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "لقد أُضيف المفتاح الأساسي في %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "لقد أُضيف الفهرس في %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "عرض الروابط" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "اقترح بناء الجدول" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add into comments" msgid "Add column" msgstr "أضف إلى الملاحظات" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "في نهاية الجدول" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "في بداية الجدول" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "بعد %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "تصميم فهرسه على %s عمود" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8234,6 +7875,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "أغلق" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/az.po b/po/az.po old mode 100755 new mode 100644 index 1eed425b2..ff0fcc303 --- a/po/az.po +++ b/po/az.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:11+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: azerbaijani \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Hamısını göster" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -38,53 +34,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Axtarış" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Davam" @@ -110,7 +90,7 @@ msgstr "" msgid "Database %1$s has been created." msgstr "%s bazası leğv edildi." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Baza qısa izahatı: " @@ -137,17 +117,10 @@ msgstr "Sütun adları" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Tip" @@ -160,7 +133,7 @@ msgstr "Tip" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -184,24 +157,18 @@ msgstr "Links to" msgid "Comments" msgstr "Qısa İzahatlar" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Xeyir" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -210,15 +177,9 @@ msgstr "Xeyir" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -237,147 +198,139 @@ msgstr "Me'lumat bazasının sxemini göster" msgid "No tables found in database." msgstr "Me'lumat bazasında cedvel yoxdur." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Hamısını Seç" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Heç birini seçme" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 #, fuzzy msgid "The database name is empty!" msgstr "Cedveli adı boşdur!" -#: db_operations.php:241 +#: db_operations.php:236 #, fuzzy, php-format msgid "Database %s has been renamed to %s" msgstr "%s cedveli %s olaraq yeniden adlandırılmışdır" -#: db_operations.php:245 +#: db_operations.php:240 #, fuzzy, php-format msgid "Database %s has been copied to %s" msgstr "%s cedveli %s - e kopyalandı." -#: db_operations.php:423 +#: db_operations.php:412 #, fuzzy msgid "Rename database to" msgstr "Cedveli yeniden adlandır" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Komanda Tipi" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "" #: db_operations.php:455 ->>>>>>> origin/master #, fuzzy msgid "Copy database to" msgstr "Baza seçilmemişdir ve ya mövcud deyildir." -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Sadece quruluş" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Quruluş ve me'lumat" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Sadece me'lumat" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "AUTO_INCREMENT deyeri elave et" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "" -#: db_operations.php:507 +#: db_operations.php:496 #, fuzzy msgid "Switch to copied database" msgstr "Kopyalanmış cedvele keç" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Status" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Enabled" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "Söndürülüb" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "Cedveli te'mir et" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Söndürülüb" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "Enabled" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master #, fuzzy msgid "Collation" msgstr "Quruluş" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -386,14 +339,14 @@ msgstr "" "Elaqelendirilmiş cedveller üçün nezerde tutulmuş be'zi xüsusiyyetler " "passivleşdirilmişdir. Sebebini aydınlaşdırmaq üçün %sbax%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "PDF Sehifelerini Deyişdir" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -402,11 +355,7 @@ msgstr "Cedvel" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Sıra sayı" @@ -414,42 +363,30 @@ msgstr "Sıra sayı" msgid "Size" msgstr "Boy" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "istifadede" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Quruluş" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "En son yenilenme" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "En son yoxlama" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -510,11 +447,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "ya da" @@ -548,85 +481,85 @@ msgstr "Use Tables" msgid "SQL query on database %s:" msgstr "SQL-query on database %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Emri İcra Et" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Giriş Tesdiq Edilmedi" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "sözlerin en azından birini" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "bütün sözleri" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "tamamile eyni sözü" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "requlyar ifade (regular expression) olaraq" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "\"%s\" üçün axtarış neticeleri %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s uyğunluq tapıldı (%s cedvelinde)" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "İçindekiler" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Sil" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Cemi: %s uyğunluq" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Search in database" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Axtarmaq üçün söz(ler) ve ya deyer(ler) (wildcard: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Tap:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Sözler boşluq ifadesi (\" \") ile ayrılmışdır." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Inside table(s):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -634,36 +567,36 @@ msgstr "Inside table(s):" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Elave et" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Quruluş" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Leğv et" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Boşalt" @@ -673,118 +606,112 @@ msgstr "Boşalt" msgid "Table %s has been emptied" msgstr "%s cedveli boşaldıldı" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, fuzzy, php-format msgid "View %s has been dropped" msgstr "%s sahesi leğv edildi" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "%s cedveli leğv edildi" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 #, fuzzy msgid "Replication" msgstr "Relations" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Cemi" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s bu MySQL serverinde esas depolama motoru olaraq qurulmuşdur." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Seçilenleri:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Hamısını Seç" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Heç Birini Seçme" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Çap görüntüsü" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Cedveli yoxla" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Cedveli optimallaşdır" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Cedveli te'mir et" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Cedveli analiz et" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Eksport" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Me'lumat lüğeti" @@ -795,10 +722,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -819,8 +746,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Fealiyyetler" @@ -856,8 +783,8 @@ msgstr "Sadece quruluş" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Cedveli yoxla" @@ -934,7 +861,7 @@ msgstr "Bookmark silindi." msgid "Showing bookmark" msgstr "" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "" @@ -1015,292 +942,189 @@ msgstr "Host adı boşdur!" msgid "The user name is empty!" msgstr "İstifadeçi adı boş qaldı!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Parol boşdur!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Girdiyiniz parollar eyni deyil!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Yeni İstifadeçi elave Et" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Server versiyası" - -#: js/messages.php:48 -#, fuzzy -msgid "Reloading Privileges" -msgstr "Qlobal selahiyyetler" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Remove selected users" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Yerli" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Prosesler" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "Müveffeqiyyetle" - -#: js/messages.php:65 -#, fuzzy -msgid "Renaming Databases" -msgstr "Cedveli yeniden adlandır" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Me'lumat Bazası" - -#: js/messages.php:67 -#, fuzzy -msgid "Copying Database" -msgstr "Baza seçilmemişdir ve ya mövcud deyildir." - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Charset" - -#: js/messages.php:69 -#, fuzzy -#| msgid "You have to choose at least one column to display" -msgid "Table must have atleast 1 column" -msgstr "Gösterilmesi üçün en az bir sütun seçmelisiniz" - -#: js/messages.php:70 -#, fuzzy -msgid "Create Table" -msgstr "Yeni Sehife qur" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Axtarış" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Modifications have been saved" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 #, fuzzy msgid "Relation deleted" msgstr "Relation view" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 #, fuzzy msgid "Internal relation added" msgstr "Ümumi elaqe variantları" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Ümumi elaqe variantları" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Söndürülüb" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Gösterilecek Saheni Seç" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "Heç biri" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Evvelki" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Sonrakı" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Cemi" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Binary" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Mar" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Apr" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "May" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "İyun" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "İyul" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Avq" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Okt" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Yan" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Fev" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Apr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1308,176 +1132,176 @@ msgid "May" msgstr "May" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "İyun" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "İyul" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Avq" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Sent" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Okt" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Noy" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Dek" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Baz" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Baz Ert" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Çerş Axş" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Cüme" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Baz" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Baz Ert" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Çerş Axş" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Çerş" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Cüme Axş" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Cüme" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Şen" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Baz" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Baz Ert" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Çerş Axş" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Çerş" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Cüme Axş" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Cüme" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Şen" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "istifadede" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1534,7 +1358,7 @@ msgstr "Indeksler" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unikal" @@ -1553,7 +1377,7 @@ msgid "Comment" msgstr "Qısa İzahatlar" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1576,8 +1400,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Me'lumat Bazaları" @@ -1740,11 +1564,7 @@ msgstr "Parol:" msgid "Server Choice" msgstr "Quraşdırılmış Serverler" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Sisteme girebilmeniz üçün çerez faylları (cookie-ler) aktiv olmalıdır." @@ -1824,11 +1644,7 @@ msgstr "" "Can not use iconv nor libiconv nor recode_string function while extension " "reports to be loaded. Check your php configuration." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Eger boş sehife ile qarşılaşsanız, demek ki, " "her şey qaydasındadır." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1865,47 +1673,27 @@ msgstr "" "$cfg['PmaAbsoluteUri'] direktivi PMA konfiqurasiya faylınızda " "QURULMAMIŞDIR!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Server" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "" @@ -1933,7 +1721,7 @@ msgstr "Gönderildi" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentasiya" @@ -1947,138 +1735,138 @@ msgstr "SQL sorğusu" msgid "MySQL said: " msgstr "MySQL deyir: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "SQL-i İzah Et" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "SQL İzah Et-i Keç" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "PHP Kodunu Gösterme" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "PHP Kodunu Hazırla" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "SQL İfadesini Yoxlama" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "SQL Tesdiqle" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Motorlar" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Müddet" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Bayt" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "QB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d %B, %Y saat %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s gün, %s saat, %s deqiqe ve %s saniye" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Başla" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Evvelki" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Son" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr ""%s" me'lumat bazasına keç." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2099,7 +1887,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Adı" @@ -2127,16 +1915,16 @@ msgstr "Sorğu" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 #, fuzzy msgid "Import" msgstr "Eksport" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Selahiyyetler" @@ -2155,11 +1943,7 @@ msgid "" msgstr "" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Aşma deyeri" @@ -2176,7 +1960,7 @@ msgstr "" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2186,36 +1970,22 @@ msgid "Change password" msgstr "Parolu Deyişdir" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Parol Yoxdur" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Parol" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Re-type" @@ -2228,20 +1998,12 @@ msgid "MySQL 4.0 compatible" msgstr "" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master #, fuzzy msgid "Generate" msgstr "Qurucu" @@ -2255,17 +2017,23 @@ msgstr "Yeni me'lumat bazası qur" msgid "Create" msgstr "Qur" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Selahiyyet çatışmazlığı" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "You have to choose at least one column to display" +msgid "Table must have at least one column." +msgstr "Gösterilmesi üçün en az bir sütun seçmelisiniz" + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "%s bazasında yeni cedvel qur" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of rows per page" msgid "Number of columns" @@ -2328,11 +2096,7 @@ msgid "remember template" msgstr "nomenklaturanı unutma" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Faylın Charset-i:" @@ -2343,7 +2107,7 @@ msgstr "Sıxışdırma" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Heç biri" @@ -2385,11 +2149,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "tekst faylından yükleyerek" @@ -2397,20 +2157,12 @@ msgstr "tekst faylından yükleyerek" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Upload işleri üçün te'yin etdiyiniz direktoriya tapılmadı" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "web-server upload direktoriyası" @@ -2539,11 +2291,7 @@ msgstr "" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "Emeliyyatlar" @@ -2615,14 +2363,14 @@ msgstr "Gösterilen setirler" msgid "total" msgstr "cemi" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "sorğu %01.4f saniyede icra edildi" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Deyişdir" @@ -2690,11 +2438,7 @@ msgstr "" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Cemi" @@ -2941,11 +2685,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Format" @@ -3017,13 +2757,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Me'lumat" @@ -3072,15 +2807,9 @@ msgstr "MIME-tipi" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Host" @@ -3280,7 +3009,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Cedvel yoxdur" @@ -3293,7 +3022,7 @@ msgstr "SQL result" msgid "Generated by" msgstr "Qurucu" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL boş netice çoxluğu gönderdi (ye'ni sıfır setir)." @@ -3440,20 +3169,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Birinci Dereceli" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "İndeks" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Tam metn (Fulltext)" @@ -3683,6 +3412,10 @@ msgstr "Bu formatın variantları yoxdur" msgid "not OK" msgstr "Müveffeqiyyetsiz" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "Müveffeqiyyetle" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Enabled" @@ -3704,7 +3437,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "Please see Documentation on how to update your Column_comments Table" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Bookmark-lanmış SQL sorğusu" @@ -3755,13 +3488,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "İstifadeçi adı" @@ -3779,22 +3507,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Deyişen" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Deyer" @@ -3813,40 +3533,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Her hansı istifadeçi" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Use text field" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Her hansı host" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Yerli" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Bu Host" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Use Host Table" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3870,7 +3561,6 @@ msgid "Use Host Table" msgstr "Use Host Table" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3905,31 +3595,31 @@ msgstr "" msgid "Servers" msgstr "Server" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Deyişenler" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 #, fuzzy msgid "Charsets" msgstr "Charset" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Motorlar" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 #, fuzzy msgid "Binary log" msgstr "Binary" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Prosesler" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3958,51 +3648,51 @@ msgstr "" msgid "Target database" msgstr "Search in database" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, fuzzy, php-format msgid "Run SQL query/queries on server %s" msgstr "%s me'lumat bazasına SQL sorğusu(-ları) gönder" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "%s me'lumat bazasına SQL sorğusu(-ları) gönder" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Sütun adları" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Bu SQL sorğusunu bookmark-la" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Bu sorğunu burada yene göster " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Submit" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Sadece göster" @@ -4179,12 +3869,12 @@ msgstr "" msgid "Save" msgstr "Qeyd Et" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format msgid "Add %s column(s)" msgstr "Yeni sahe elave et" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to add at least one column." @@ -4368,8 +4058,8 @@ msgstr "Yenile" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "İstifadeçi" @@ -4804,115 +4494,115 @@ msgstr "MySQL Depolama Motorları" msgid "View dump (schema) of databases" msgstr "Me'lumat bazalarının sxemini göster" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "GRANT-dan başqa bütün selahiyyetler daxildir." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Mövcud olan cedvellerin strukturunu deyişdirmeye icaze verir." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 #, fuzzy msgid "Allows altering and dropping stored routines." msgstr "Allows creating and dropping indexes." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Yeni bazalar ve cedveller qurmağa icaze verir." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 #, fuzzy msgid "Allows creating stored routines." msgstr "Yeni cedveller qurmağa icaze verir." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Yeni cedveller qurmağa icaze verir." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Keçici cedveller qurmağa icaze verir." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 #, fuzzy msgid "Allows creating new views." msgstr "Yeni cedveller qurmağa icaze verir." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Me'lumat silmeye icaze verir." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Baza ve cedvel leğv etmeye icaze verir." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Cedvelleri leğv etmeye icaze verir." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Allows importing data from and exporting data into files." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Allows adding users and privileges without reloading the privilege tables." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Allows creating and dropping indexes." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Allows inserting and replacing data." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Allows locking tables for the current thread." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Limits the number of new connections the user may open per hour." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Limits the number of queries the user may send to the server per hour." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4920,59 +4610,59 @@ msgstr "" "Limits the number of commands that change any table or database the user may " "execute per hour." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 #, fuzzy msgid "Limits the number of simultaneous connections the user may have." msgstr "Limits the number of new connections the user may open per hour." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Has no effect in this MySQL version." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "Allows reloading server settings and flushing the server's caches." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Gives the right to the user to ask where the slaves / masters are." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Needed for the replication slaves." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Allows reading data." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Gives access to the complete list of databases." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Allows shutting down the server." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -4982,158 +4672,158 @@ msgstr "" "Required for most administrative operations like setting global variables or " "killing threads of other users." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "Allows creating and dropping indexes." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Allows changing data." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Selahiyyet te'yin edilmedi." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Heç biri" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Cedvelexas selahiyyetler" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Qeyd: MySQL selahiyyet adları ingilis dilinde ifade edilmişdir " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Qlobal selahiyyetler" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Me'lumat Bazasına Mexsus Selahiyyetler" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administrasiya" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Resource limits" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Qeyd: Bu variantları 0 (sıfır)-a çevirmek hüdudu (limiti) qaldıracaq." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Sisteme Giriş Me'lumatı" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Parolu deyişdirme" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "İstifadeçi(ler) tapılmadı." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "%s istifadeçisi mövcuddur!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Yeni istifadeçi elave etdiniz." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "You have updated the privileges for %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "You have revoked the privileges for %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "%s üçün parol müveffeqiyyetle deyişdirilmişdir." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "%s silinir" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Reloading the privileges" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "The selected users have been deleted successfully." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "The privileges were reloaded successfully." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Selahiyyetleri Deyişdir" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Revoke" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "User overview" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "İcaze ver" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Her hansı" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Yeni İstifadeçi elave Et" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Remove selected users" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Revoke all active privileges from the users and delete them afterwards." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "İstifadeçilerle eyni adlı me'lumat bazalarını leğv et." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, fuzzy, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5146,48 +4836,48 @@ msgstr "" "içerisindekiler webserver-in istifade etdiklerinden ferqli ola biler. Bu " "halda, davam etmeden evvel, selahiyyetleri %syeniden yüklemelisiniz%s." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "The selected user was not found in the privilege table." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Sütunaxas Selahiyyetler" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Aşağıdakı me'lumat bazası üçün selahiyyet müeyyen et" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Aşağıdakı cedvel üçün selahiyyetler müeyyen et" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Sistem Giriş Me'lumatını Deyişdir / İstifadeçini Kopyala" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Eyni selahiyyetlere sahib yeni istifadeçi qur ve ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... köhnesini saxla." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... istifadeçi cedvellerinden köhnesini sil." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... köhne istifadeçinin selahiyyetlerini elinden alaraq onu sil." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5195,44 +4885,44 @@ msgstr "" " ... istifadeçi cedvellerinden köhnesini sil ve ardından selahiyyetleri " "yeniden yükle." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Heç biri" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr ""%s" bazası üçün selahiyyetleri gözden keçir." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Users having access to "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "qlobal" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "bazayaxas" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "xüsusi işare" @@ -7854,25 +7544,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Etiket" @@ -7925,13 +7615,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Evvelki sehifeye qayıt" @@ -8010,7 +7693,7 @@ msgstr "(\"PRIMARY\" sadece birinci dereceli açarın adı olmalıdır!)" msgid "Add to index  %s column(s)" msgstr "İndekse  %s sütun elave et" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -8127,41 +7810,6 @@ msgstr "Check referential integrity:" msgid "Show tables" msgstr "Cedvelleri göster" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Yer istifadesi" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Miqdar" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Effektiv" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Sıra Statistikası" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Variantlar" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinamik" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Sıra uzunluğu" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Yer istifadesi" @@ -8195,7 +7843,6 @@ msgid "Row length" msgstr "Sıra uzunluğu" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Sıra boyu " @@ -8267,49 +7914,49 @@ msgstr "Heç biri" msgid "Column %s has been dropped" msgstr "%s cedveli leğv edildi" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "%s üzerine Birinci Dereceli Açar elave edildi." -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "%s üzerine indeks elave edildi" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Relation view" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Alternativ cedvel strukturu" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy msgid "Add column" msgstr "Yeni sahe elave et" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Cedvelin sonuna" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Cedvelin başına" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Sonra: %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr " %s sütunda indeks yarat" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8351,6 +7998,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8703,6 +8354,10 @@ msgstr "Cedveli yeniden adlandır" #~ msgid "Process list" #~ msgstr "Proses Siyahısı" +#, fuzzy +#~ msgid "Reload privileges" +#~ msgstr "Qlobal selahiyyetler" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/be.po b/po/be.po old mode 100755 new mode 100644 index 9b92d7da3..09db31cd0 --- a/po/be.po +++ b/po/be.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: belarusian_cyrillic \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Паказаць усе" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Пошук" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Панеслася" @@ -113,7 +93,7 @@ msgstr "Выкарыстоўваць гэта значэньне" msgid "Database %1$s has been created." msgstr "База дадзеных %1$s створаная." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Камэнтар да базы дадзеных: " @@ -140,17 +120,10 @@ msgstr "Назвы калёнак" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Тып" @@ -163,7 +136,7 @@ msgstr "Тып" msgid "Null" msgstr "Нуль" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -187,24 +160,18 @@ msgstr "Зьвязаная з" msgid "Comments" msgstr "Камэнтары" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Не" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -213,15 +180,9 @@ msgstr "Не" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -240,143 +201,135 @@ msgstr "Праглядзець дамп (схему) базы дадзеных" msgid "No tables found in database." msgstr "У базе дадзеных табліц ня выяўлена." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Выбраць усё" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Зьняць усе адзнакі" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Імя базы дадзеных не пазначанае!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "База дадзеных %s была перайменаваная ў %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "База дадзеных %s была скапіяваная ў %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Перайменаваць базу дадзеных у" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Каманда" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "і пасьля" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Капіяваць базу дадзеных у" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Толькі структуру" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Структуру і дадзеныя" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Толькі дадзеныя" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "выканаць CREATE DATABASE перад капіяваньнем" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Дадаць %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Дадаць значэньне AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Дадаць абмежаваньні" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Перайсьці да скапіяванай базы дадзеных" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Стан" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Уключана" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "Адключана" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair" msgctxt "BLOB repository" msgid "Repair" msgstr "Адрамантаваць" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Адключана" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "Уключана" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Супастаўленьне" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -385,14 +338,14 @@ msgstr "" "Дадатковыя магчымасьці работы з зьвязанымі табліцамі былі адключаныя. Каб " "высьветліць чаму, націсьніце %sтут%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Рэдагаваць PDF-старонкі" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -401,11 +354,7 @@ msgstr "Табліца" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Радкі" @@ -413,42 +362,30 @@ msgstr "Радкі" msgid "Size" msgstr "Памер" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "выкарыстоўваецца" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Створаная" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Апошняе абнаўленьне" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Апошняя праверка" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -509,11 +446,7 @@ msgstr "Выдаліць" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Або" @@ -547,85 +480,85 @@ msgstr "Выкарыстоўваць табліцы" msgid "SQL query on database %s:" msgstr "SQL-запыт да БД %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Выканаць запыт" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "У доступе адмоўлена" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "прынамсі адно з словаў" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "усе словы" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "дакладную фразу" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "рэгулярны выраз" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Вынікі пошуку \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s супадзеньняў у табліцы %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Прагляд" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Выдаліць" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Агулам: %s супадзеньняў" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Пошук у базе дадзеных" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Слова(ы) або значэньне(і) для пошуку (маска: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Знайсьці:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Словы, падзеленыя прагалам (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "У табліцы(ах):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -633,36 +566,36 @@ msgstr "Унутры поля:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Уставіць" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Структура" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Выдаліць" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Ачысьціць" @@ -672,25 +605,25 @@ msgstr "Ачысьціць" msgid "Table %s has been emptied" msgstr "Табліца %s была ачышчаная" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Выгляд %s быў выдалены" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Табліца %s была выдаленая" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -699,94 +632,88 @@ msgstr "" "Гэты прагляд мае толькі такую колькасьць радкоў. Калі ласка, зьвярніцеся да %" "sдакумэнтацыі%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Выгляд" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Рэплікацыя" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Усяго" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "" "%s зьяўляецца машынай захаваньня дадзеных па змоўчаньні на гэтым MySQL-" "сэрвэры." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "З адзначанымі:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Адзначыць усё" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Зьняць усе адзнакі" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Адзначыць тыя, што патрабуюць аптымізацыі" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Вэрсія для друку" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Праверыць табліцу" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Аптымізаваць табліцу" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Рамантаваць табліцу" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Аналізаваць табліцу" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Экспарт" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Слоўнік дадзеных" @@ -798,10 +725,10 @@ msgstr "Праверыць табліцу" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -823,8 +750,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Дзеяньне" @@ -861,8 +788,8 @@ msgstr "Толькі структуру" msgid "Untracked tables" msgstr "Праверыць табліцу" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Праверыць табліцу" @@ -949,7 +876,7 @@ msgstr "Закладка была выдаленая." msgid "Showing bookmark" msgstr "Паказваючы закладку" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Закладка %s створаная" @@ -1033,293 +960,186 @@ msgstr "Пустое імя хосту!" msgid "The user name is empty!" msgstr "Пустое імя карыстальніка!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Пусты пароль!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Паролі не супадаюць!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Дадаць новага карыстальніка" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Стварыць сувязь" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Перазагрузіць прывілеі" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Выдаліць выбраных карыстальнікаў" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Скасаваць" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Лякальны" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Працэсы" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Перайменаваць базу дадзеных у" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "База дадзеных" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Капіяваць базу дадзеных у" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Кадыроўка" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Табліца мусіць мець прынамсі адно поле." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Стварыць табліцу" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Пошук" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Мадыфікацыі былі захаваныя" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Сувязь выдаленая" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "Сувязь FOREIGN KEY была дададзеная" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Унутраная сувязь дададзеная" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Памылка: сувязь не дададзеная." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Памылка: сувязь ужо існуе." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Памылка захаваньня каардынатаў." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Магчымасьці асноўных сувязяў" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Адключана" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Выберыце спасылкавы ключ" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Выберыце зьнешні ключ" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Калі ласка, выберыце першасны (PRIMARY) альбо ўнікальны ключ (UNIQUE)" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Выберыце поле для адлюстраваньня" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy msgid "Done" msgstr "Дадзеныя" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Папярэдняя старонка" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Наступная старонка" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Агулам" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Двайковы" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Сак" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Кра" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Тра" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Чэр" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Ліп" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Жні" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Кас" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Сту" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Лют" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Сак" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Кра" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1327,178 +1147,178 @@ msgid "May" msgstr "Тра" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Чэр" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Ліп" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Жні" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Вер" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Кас" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Ліс" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Сьн" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Ндз" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Пан" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Аўт" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Пят" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Ндз" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Пан" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Аўт" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Сер" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Цач" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Пят" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Суб" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Ндз" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Пан" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Аўт" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Сер" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Цач" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Пят" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Суб" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "Wiki" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "выкарыстоўваецца" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1559,7 +1379,7 @@ msgstr "Індэксы" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Унікальнае" @@ -1577,7 +1397,7 @@ msgid "Comment" msgstr "Камэнтар" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1602,8 +1422,8 @@ msgstr "" "Падобна, што індэксы %1$s і %2$s зьяўляюцца аднолькавымі, а таму адзін зь " "іх, магчыма, можна выдаліць." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Базы дадзеных" @@ -1775,11 +1595,7 @@ msgstr "Пароль:" msgid "Server Choice" msgstr "Выбар сэрвэра" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Cookies мусяць быць уключанымі пасьля гэтага месца." @@ -1862,11 +1678,7 @@ msgstr "" "час, як пашырэньне паведамляе, што яно загружанае. Праверце вашую " "канфігурацыю PHP." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Калі вы атрымаеце чыстую старонку, значыць, усё добра." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Немагчыма загрузіць канфігурацыю па змоўчаньні з: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1904,49 +1708,29 @@ msgstr "" "Дырэктыва $cfg['PmaAbsoluteUri'] ПАВІННА быць вызначаная ў вашым " "канфігурацыйным файле!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Некарэктны індэкс сэрвэра: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" "Няправільнае імя хосту для сэрвэра %1$s. Калі ласка, праверце канфігурыцыю." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Сэрвэр" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "У канфігурацыі вызначаны некарэктны мэтад аўтэнтыфікацыі:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "У канфігурацыі вызначаны некарэктны мэтад аўтэнтыфікацыі:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Вам трэба абнавіць %s да вэрсіі %s ці пазьнейшай." @@ -1974,7 +1758,7 @@ msgstr "Адпраўлена" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Дакумэнтацыя" @@ -1988,139 +1772,139 @@ msgstr "SQL-запыт" msgid "MySQL said: " msgstr "Адказ MySQL: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Тлумачыць SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Не тлумачыць SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "Без PHP-коду" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Стварыць PHP-код" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Абнавіць" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Не правяраць SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Праверыць SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Машыны" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Прафіляваньне" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Час" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Б" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "КiБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "МіБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "ГіБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "ТіБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "ПіБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "ЭіБ" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d %B %Y, %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s дзён, %s гадзінаў, %s хвілінаў і %s сэкундаў" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Першая старонка" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Папярэдняя старонка" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Апошняя старонка" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Перайсьці да базы дадзеных "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" "Існуе вядомая памылка з выкарыстаньнем парамэтра %s, глядзіце апісаньне на %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2140,7 +1924,7 @@ msgid "Events" msgstr "Падзеі" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Назва" @@ -2168,15 +1952,15 @@ msgstr "Запыт згодна прыкладу" msgid "Designer" msgstr "Дызайнэр" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Імрарт" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Прывілеі" @@ -2195,11 +1979,7 @@ msgid "" msgstr "Значэньне можа быць прыблізным. Гл. FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Выкарыстаньне рэсурсаў" @@ -2218,7 +1998,7 @@ msgstr "Сэрвэр не адказвае" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(або сокет лякальнага сэрвэра MySQL не сканфігураваны правільна)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Падрабязьней..." @@ -2228,36 +2008,22 @@ msgid "Change password" msgstr "Зьмяніць пароль" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Без пароля" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Пароль" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Пацьверджаньне" @@ -2272,20 +2038,12 @@ msgid "MySQL 4.0 compatible" msgstr "Сумяшчальнае з MySQL 4.0" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Згенэраваць пароль" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Згенэраваць" @@ -2298,17 +2056,23 @@ msgstr "Стварыць новую базу дадзеных" msgid "Create" msgstr "Стварыць" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Без прывілеяў" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Табліца мусіць мець прынамсі адно поле." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Стварыць новую табліцу ў БД %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2375,11 +2139,7 @@ msgid "remember template" msgstr "запомніць шаблён" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Кадыроўка файла:" @@ -2390,7 +2150,7 @@ msgstr "Сьціск" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Няма" @@ -2432,11 +2192,7 @@ msgstr "" msgid "File to import" msgstr "Імпартаваць файл" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Месцазнаходжаньне тэкставага файла" @@ -2444,20 +2200,12 @@ msgstr "Месцазнаходжаньне тэкставага файла" msgid "File uploads are not allowed on this server." msgstr "Загрузкі файлаў не дазволеныя на гэтым сэрвэры." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Немагчыма адкрыць пазначаную вамі тэчку для загрузкі файлаў" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "тэчка вэб-сэрвэра для загрузкі файлаў" @@ -2593,11 +2341,7 @@ msgstr "Сартаваць па ключы" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Налады" @@ -2667,14 +2411,14 @@ msgstr "Паказаныя запісы" msgid "total" msgstr "усяго" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Запыт выконваўся %01.4f сэк" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Зьмяніць" @@ -2744,11 +2488,7 @@ msgstr "Выкарыстаньне пулу буфэру" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Агулам" @@ -3037,11 +2777,7 @@ msgstr "" "будуць перайменаваныя і ім будзе дадзены чарговы найвышэйшы нумар." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Фармат" @@ -3113,13 +2849,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Дадзеныя" @@ -3168,15 +2899,9 @@ msgstr "MIME-тып" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Хост" @@ -3375,7 +3100,7 @@ msgstr "Тып экспарту" msgid "Open new phpMyAdmin window" msgstr "Адкрыць новае акно phpMyAdmin" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Няма табліц" @@ -3388,7 +3113,7 @@ msgstr "SQL-вынік" msgid "Generated by" msgstr "Створаны" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL вярнула пусты вынік (то бок нуль радкоў)." @@ -3538,20 +3263,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Першасны" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Індэкс" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Поўнатэкстэкставае" @@ -3776,6 +3501,10 @@ msgstr "Гэты фармат ня мае опцыяў" msgid "not OK" msgstr "не OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Уключана" @@ -3799,7 +3528,7 @@ msgstr "" "За інфармацыяй як абнавіць табліцу column_comments зьвярніцеся, калі ласка, " "да дакумэнтацыі" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Закладзены SQL-запыт" @@ -3850,13 +3579,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Імя карыстальніка" @@ -3876,22 +3600,14 @@ msgstr "Паказаць стан залежных сэрвэраў" msgid "Slave status" msgstr "Паказаць стан залежных сэрвэраў" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Зьменная" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Значэньне" @@ -3909,40 +3625,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Любы карыстальнік" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Выкарыстоўваць тэкставае поле" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Любы хост" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Лякальны" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Гэты хост" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Выкарыстоўваць табліцу хостаў" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3966,7 +3653,6 @@ msgid "Use Host Table" msgstr "Выкарыстоўваць табліцу хостаў" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -4000,29 +3686,29 @@ msgstr "Невядомая мова: %1$s." msgid "Servers" msgstr "Сэрвэры" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Зьменныя" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Кадыроўкі" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Машыны" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Двайковы лог" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Працэсы" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -4052,51 +3738,51 @@ msgstr "" msgid "Target database" msgstr "Пошук у базе дадзеных" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Выканаць SQL-запыт(ы) на сэрвэры %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Выканаць SQL-запыт(ы) на базе дадзеных %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Назвы калёнак" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Дадаць гэты SQL-запыт у закладкі" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Даць кожнаму карыстальніку доступ да гэтай закладкі" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Замяніць існую закладку з такім жа імем" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Не перазапісвайце гэты запыт у іншых вокнах" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Разьдзяляльнік" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Паказаць гэты запыт зноў " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Адправіць" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Толькі прагляд" @@ -4276,13 +3962,13 @@ msgstr "Азначэньне PARTITION" msgid "Save" msgstr "Захаваць" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "Дадаць %s новыя палі" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4498,8 +4184,8 @@ msgstr "Скінуць" msgid "Protocol version" msgstr "Вэрсія пратаколу" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Карыстальнік" @@ -4952,119 +4638,119 @@ msgstr "Машыны захаваньня дадзеных" msgid "View dump (schema) of databases" msgstr "Праглядзець дамп (схему) базаў дадзеных" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Уключае ўсе прывілеі, апроч GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Дазваляе зьмяняць структуру існых табліц." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Дазваляе зьмяняць і выдаляць праграмы, якія захоўваюцца." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Дазваляе ствараць новыя базы дадзеных і табліцы." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Дазваляе ствараць праграмы, якія захоўваюцца." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Дазваляе ствараць новыя табліцы." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Дазваляе ствараць часовыя табліцы." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" "Дазваляе ствараць, выдаляць і пераймяноўваць уліковыя запісы карыстальнікаў" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Дазваляе ствараць новыя прагляды." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Дазваляе выдаляць дадзеныя." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Дазваляе выдаляць базы дадзеных і табліцы." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Дазваляе выдаляць табліцы." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Дазваляе ствараць падзеі ў пляніроўніку падзеяў" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Дазваляе выкананьне праграмаў, якія захоўваюцца." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "" "Дазваляе імпартаваць дадзеныя з файлаў і экспартаваць дадзеныя ў файлы." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Дазваляе дадаваць карыстальнікаў і прывілеі без перазагрузкі табліц " "прывілеяў." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Дазваляе ствараць і выдаляць індэксы." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Дазваляе ўстаўляць і замяняць дадзеныя." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Дазваляе блякаваць табліцы для бягучага патоку." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Абмяжоўвае колькасьць новых злучэньняў, якія карыстальнік можа адкрыць на " "працягу гадзіны." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Абмяжоўвае колькасьць запытаў, якія карыстальнік можа адправіць на сэрвэр на " "працягу гадзіны." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5072,59 +4758,59 @@ msgstr "" "Абмяжоўвае колькасьць камандаў, зьмяняючых любую табліцу або базу дадзеных, " "якія карыстальнік можа выканаць на працягу гадзіны." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "" "Абмяжоўвае колькасьць адначасовых злучэньняў, якія можа мець карыстальнік." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Дазваляе праглядаць працэсы ўсіх карыстальнікаў" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Не працуе ў гэтай вэрсіі MySQL." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "Дазваляе перазагружаць налады сэрвэра і ачышчаць кэш сэрвэра." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Дазваляе карыстальніку пытацца, дзе знаходзяцца slaves / masters." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Неабходна для рэплікацыі slaves." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Дазваляе чытаць дадзеныя." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Дае доступ да поўнага сьпісу базаў дадзеных." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Дазваляе выкананьне запытаў SHOW CREATE VIEW." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Дазваляе спыняць сэрвэр." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5134,156 +4820,156 @@ msgstr "" "Патрабуецца для большасьці адміністратыўных апэрацыяў, такіх як вызначэньне " "глябальных зьменных або спыненьне патокаў іншых карыстальнікаў." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Дазваляе стварэньне і выдаленьне трыгераў" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Дазваляе зьмяняць дадзеныя." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Без прывілеяў." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Няма" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Прывілеі, спэцыфічныя для табліцы" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Заўвага: імёны прывілеяў MySQL задаюцца па-ангельску " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Глябальныя прывілеі" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Спэцыфічныя прывілеі базы дадзеных" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Адміністраваньне" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Абмежаваньні рэсурсаў" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Заўвага: Пазначэньне гэтых опцыяў як 0 (нуль) здымае абмежаваньне." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Інфармацыя пра ўваход" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Не зьмяняць пароль" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Не знойдзены карыстальнік." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Карыстальнік %s ужо існуе!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Быў дададзены новы карыстальнік." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Вы зьмянілі прывілеі для %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Вы анулявалі прывілеі для %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Пароль для %s пасьпяхова зьменены." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Выдаленьне %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "На выбраныя карыстальнікі для выдаленьня!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Перазагрузіць прывілеі" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Выбраныя карыстальнікі былі пасьпяхова выдаленыя." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Прывілеі былі пасьпяхова перазагружаныя." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Рэдагаваць прывілеі" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Ануляваць" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Карыстальнікі" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Grant" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Любы" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Дадаць новага карыстальніка" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Выдаліць выбраных карыстальнікаў" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Ануляваць усе актыўныя прывілеі карыстальнікаў і пасьля выдаліць іх." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Выдаліць базы дадзеных, якія маюць такія ж імёны як і карыстальнікі." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5296,50 +4982,50 @@ msgstr "" "якія выкарыстоўвае сэрвэр, калі яны былі зьмененыя ўручную. У гэтым выпадку " "вам трэба %sперазагрузіць прывілеі%s да таго, як вы працягнеце." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Вылучаны карыстальнік ня знойдзены ў табліцы прывілеяў." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Спэцыфічныя прывілеі калёнак" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Дадаць прывілеі на наступную базу" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Сымбалі падстаноўкі _ і % мусяць быць экранаванымі сымбалем \\ для іх " "літаральнага выкарыстаньня" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Дадаць прывілеі на наступную табліцу" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Зьмяніць рэгістрацыйную інфармацыю / Капіяваць карыстальніка" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Стварыць новага карыстальніка з такімі ж прывілеямі і ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... пакінуць старога." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... выдаліць старога з табліцы карыстальнікаў." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... ануляваць усе актыўныя прывілеі старога і пасьля выдаліць яго." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5347,45 +5033,45 @@ msgstr "" " ... выдаліць старога з табліцы карыстальнікаў і пасьля перазагрузіць " "прывілеі." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "База дадзеных для карыстальніка" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Няма" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Стварыць базу дадзеных з такім самым імем і надзяліць усімі прывілеямі" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" "Надзяліць усімі прывілеямі базы з іменамі па масцы (імя карыстальніка_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "Праверыць прывілеі для базы "%s"." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Карыстальнікі з правамі доступу да "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "глябальны" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "спэцыфічны для базы дадзеных" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "шаблён" @@ -8167,25 +7853,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "ID устаўленага радку: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "У выглядзе PHP-коду" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "У выглядзе SQL-запыту" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Праблемы з індэксамі для табліцы `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Метка" @@ -8238,13 +7924,6 @@ msgstr "" msgid "Show insert query" msgstr "У выглядзе SQL-запыту" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "і пасьля" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Перайсьці да папярэдняй старонкі" @@ -8326,7 +8005,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Дадаць да індэкса  %s калёнку(і)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Колькасьць калёнак мусіць быць большай за нуль." @@ -8440,41 +8119,6 @@ msgstr "Праверыць цэласнасьць дадзеных:" msgid "Show tables" msgstr "Паказаць табліцы" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Выкарыстаньне прасторы" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Выкарыстаньне" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Эфэктыўнасьць" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Статыстыка радку" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Выразы" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "дынамічны" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Даўжыня радка" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Выкарыстаньне прасторы" @@ -8508,7 +8152,6 @@ msgid "Row length" msgstr "Даўжыня радка" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Памер радка " @@ -8582,50 +8225,50 @@ msgstr "Няма" msgid "Column %s has been dropped" msgstr "Табліца %s была выдаленая" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Першасны ключ быў дададзены да %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Быў дададзены індэкс для %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Прагляд залежнасьцяў" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Прапанаваная структура табліцы" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "Дадаць %s новыя палі" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "У канцы табліцы" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "У пачатку табліцы" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Пасьля %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Стварыць індэкс на %s калёнках" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "падзеленая на сэкцыі" @@ -8667,6 +8310,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -9079,6 +8726,9 @@ msgstr "Перайменаваць табліцу ў" #~ msgid "Process list" #~ msgstr "Сьпіс працэсаў" +#~ msgid "Reload privileges" +#~ msgstr "Перазагрузіць прывілеі" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/be@latin.po b/po/be@latin.po old mode 100755 new mode 100644 index 249e2d1e1..8a34ef213 --- a/po/be@latin.po +++ b/po/be@latin.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-30 23:09+0200\n" "Last-Translator: Michal \n" "Language-Team: belarusian_latin \n" @@ -20,11 +16,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Pakazać usie" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -43,53 +39,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Pošuk" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Paniesłasia" @@ -115,7 +95,7 @@ msgstr "Vykarystoŭvać heta značeńnie" msgid "Database %1$s has been created." msgstr "Baza dadzienych %1$s stvoranaja." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Kamentar da bazy dadzienych: " @@ -142,17 +122,10 @@ msgstr "Nazvy kalonak" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Typ" @@ -165,7 +138,7 @@ msgstr "Typ" msgid "Null" msgstr "Nul" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -189,24 +162,18 @@ msgstr "Źviazanaja z" msgid "Comments" msgstr "Kamentary" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Nie" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -215,15 +182,9 @@ msgstr "Nie" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -242,141 +203,133 @@ msgstr "Prahladzieć damp (schiemu) bazy dadzienych" msgid "No tables found in database." msgstr "U bazie dadzienych tablic nia vyjaŭlena." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Vybrać usio" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Źniać usie adznaki" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Imia bazy dadzienych nie paznačanaje!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Baza dadzienych %s była pierajmienavanaja ŭ %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Baza dadzienych %s była skapijavanaja ŭ %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Pierajmienavać bazu dadzienych u" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Kamanda" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "i paśla" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Kapijavać bazu dadzienych u" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Tolki strukturu" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Strukturu i dadzienyja" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Tolki dadzienyja" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "vykanać CREATE DATABASE pierad kapijavańniem" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Dadać %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Dadać značeńnie AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Dadać abmiežavańni" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Pierajści da skapijavanaj bazy dadzienych" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Stan" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Uklučana" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair" msgctxt "BLOB repository" msgid "Repair" msgstr "Adramantavać" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Adklučana" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Supastaŭleńnie" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -385,14 +338,14 @@ msgstr "" "Dadatkovyja mahčymaści raboty z źviazanymi tablicami byli adklučanyja. Kab " "vyśvietlić čamu, naciśnicie %stut%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Redagavać PDF-staronki" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -401,11 +354,7 @@ msgstr "Tablica" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Radki" @@ -413,42 +362,30 @@ msgstr "Radki" msgid "Size" msgstr "Pamier" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "vykarystoŭvajecca" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Stvoranaja" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Apošniaje abnaŭleńnie" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Apošniaja pravierka" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -510,11 +447,7 @@ msgstr "Vydalić" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Abo" @@ -548,85 +481,85 @@ msgstr "Vykarystoŭvać tablicy" msgid "SQL query on database %s:" msgstr "SQL-zapyt da BD %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Vykanać zapyt" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "U dostupie admoŭlena" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "prynamsi adno z słovaŭ" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "usie słovy" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "dakładnuju frazu" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "rehularny vyraz" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Vyniki pošuku \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s supadzieńniaŭ u tablicy %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Prahlad" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Vydalić" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Ahułam: %s supadzieńniaŭ" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Pošuk u bazie dadzienych" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Słova(y) abo značeńnie(i) dla pošuku (maska: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Znajści:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Słovy, padzielenyja prahałam (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "U tablicy(ach):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -634,36 +567,36 @@ msgstr "Unutry pola:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Ustavić" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Struktura" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Vydalić" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Ačyścić" @@ -673,25 +606,25 @@ msgstr "Ačyścić" msgid "Table %s has been emptied" msgstr "Tablica %s była ačyščanaja" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Vyhlad %s byŭ vydaleny" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Tablica %s była vydalenaja" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -700,94 +633,88 @@ msgstr "" "Hety prahlad maje tolki takuju kolkaść radkoŭ. Kali łaska, źviarniciesia da %" "sdakumentacyi%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Vyhlad" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replikacyja" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Usiaho" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "" "%s źjaŭlajecca mašynaj zachavańnia dadzienych pa zmoŭčańni na hetym MySQL-" "servery." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Z adznačanymi:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Adznačyć usio" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Źniać usie adznaki" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Adznačyć tyja, što patrabujuć aptymizacyi" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Versija dla druku" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Pravieryć tablicu" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Aptymizavać tablicu" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Ramantavać tablicu" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analizavać tablicu" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Ekspart" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Słoŭnik dadzienych" @@ -798,10 +725,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -821,8 +748,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Dziejańnie" @@ -856,8 +783,8 @@ msgstr "" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "" @@ -942,7 +869,7 @@ msgstr "Zakładka była vydalenaja." msgid "Showing bookmark" msgstr "Pakazvajučy zakładku" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Zakładka %s stvoranaja" @@ -1026,296 +953,187 @@ msgstr "Pustoje imia chostu!" msgid "The user name is empty!" msgstr "Pustoje imia karystalnika!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Pusty parol!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Paroli nie supadajuć!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Dadać novaha karystalnika" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create" -msgid "Create User" -msgstr "Stvaryć" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Pierazahruzić pryvilei" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Vydalić vybranych karystalnikaŭ" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Skasavać" -#: js/messages.php:57 -#, fuzzy -#| msgid "Log in" -msgid "Loading" -msgstr "Uvachod u systemu" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Pracesy" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Pierajmienavać bazu dadzienych u" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Baza dadzienych" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Kapijavać bazu dadzienych u" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Kadyroŭka" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Tablica musić mieć prynamsi adno pole." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Stvaryć tablicu" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Pošuk" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Madyfikacyi byli zachavanyja" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Suviaź vydalenaja" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "Suviaź FOREIGN KEY była dadadzienaja" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Unutranaja suviaź dadadzienaja" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Pamyłka: suviaź nie dadadzienaja." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Pamyłka: suviaź užo isnuje." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Pamyłka zachavańnia kaardynataŭ." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Mahčymaści asnoŭnych suviaziaŭ" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Adklučana" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Vybierycie spasyłkavy kluč" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Vybierycie źniešni kluč" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Kali łaska, vybierycie pieršasny (PRIMARY) albo ŭnikalny kluč (UNIQUE)" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Vybierycie pole dla adlustravańnia" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "Nijakaja" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Papiaredniaja staronka" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Nastupnaja staronka" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Ahułam" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Dvajkovy" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Sak" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Kra" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Tra" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Čer" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Lip" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Žni" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Kas" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Stu" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Lut" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Sak" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Kra" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1323,178 +1141,178 @@ msgid "May" msgstr "Tra" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Čer" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Lip" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Žni" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Vier" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Kas" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Lis" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Śn" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Ndz" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Pan" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Aŭt" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Piat" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Ndz" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Pan" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Aŭt" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Sier" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Cač" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Piat" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sub" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Ndz" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Pan" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Aŭt" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Sier" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Cač" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Piat" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Sub" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "Wiki" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "vykarystoŭvajecca" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1556,7 +1374,7 @@ msgstr "Indeksy" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unikalnaje" @@ -1574,7 +1392,7 @@ msgid "Comment" msgstr "Kamentar" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1599,8 +1417,8 @@ msgstr "" "Padobna, što indeksy %1$s i %2$s źjaŭlajucca adnolkavymi, a tamu adzin ź " "ich, mahčyma, možna vydalić." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Bazy dadzienych" @@ -1772,11 +1590,7 @@ msgstr "Parol:" msgid "Server Choice" msgstr "Vybar servera" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Cookies musiać być uklučanymi paśla hetaha miesca." @@ -1859,11 +1673,7 @@ msgstr "" "toj čas, jak pašyreńnie paviedamlaje, što jano zahružanaje. Praviercie " "vašuju kanfihuracyju PHP." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Niemahčyma zahruzić kanfihuracyju pa zmoŭčańni z: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1901,50 +1703,30 @@ msgstr "" "Dyrektyva $cfg['PmaAbsoluteUri'] PAVINNA być vyznačanaja ŭ vašym " "kanfihuracyjnym fajle!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Niekarektny indeks servera: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" "Niapravilnaje imia chostu dla servera %1$s. Kali łaska, praviercie " "kanfihurycyju." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Server" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "U kanfihuracyi vyznačany niekarektny metad aŭtentyfikacyi:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "U kanfihuracyi vyznačany niekarektny metad aŭtentyfikacyi:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Vam treba abnavić %s da versii %s ci paźniejšaj." @@ -1970,7 +1752,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dakumentacyja" @@ -1984,140 +1766,140 @@ msgstr "SQL-zapyt" msgid "MySQL said: " msgstr "Adkaz MySQL: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Tłumačyć SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Nie tłumačyć SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "Biez PHP-kodu" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Stvaryć PHP-kod" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Abnavić" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Nie praviarać SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Pravieryć SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Mašyny" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Prafilavańnie" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Čas" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "B" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EiB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d %B %Y, %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s dzion, %s hadzinaŭ, %s chvilinaŭ i %s sekundaŭ" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Pieršaja staronka" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Papiaredniaja staronka" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Apošniaja staronka" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Pierajści da bazy dadzienych \"%s\"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" "Isnuje viadomaja pamyłka z vykarystańniem parametra %s, hladzicie apisańnie " "na %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2137,7 +1919,7 @@ msgid "Events" msgstr "Padziei" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Nazva" @@ -2165,15 +1947,15 @@ msgstr "Zapyt zhodna prykładu" msgid "Designer" msgstr "Dyzajner" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Imrart" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Pryvilei" @@ -2192,11 +1974,7 @@ msgid "" msgstr "Značeńnie moža być prybliznym. Hł. FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Vykarystańnie resursaŭ" @@ -2215,7 +1993,7 @@ msgstr "Server nie adkazvaje" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(abo sokiet lakalnaha servera MySQL nie skanfihuravany pravilna)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Padrabiaźniej..." @@ -2225,36 +2003,22 @@ msgid "Change password" msgstr "Źmianić parol" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Biez parola" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Parol" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Paćvierdžańnie" @@ -2269,20 +2033,12 @@ msgid "MySQL 4.0 compatible" msgstr "Sumiaščalnaje z MySQL 4.0" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Zgieneravać parol" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Zgieneravać" @@ -2295,17 +2051,23 @@ msgstr "Stvaryć novuju bazu dadzienych" msgid "Create" msgstr "Stvaryć" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Biez pryvilejaŭ" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Tablica musić mieć prynamsi adno pole." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Stvaryć novuju tablicu ŭ BD %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2372,11 +2134,7 @@ msgid "remember template" msgstr "zapomnić šablon" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Kadyroŭka fajła:" @@ -2387,7 +2145,7 @@ msgstr "Ścisk" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Nijakaja" @@ -2429,11 +2187,7 @@ msgstr "" msgid "File to import" msgstr "Impartavać fajł" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Miescaznachodžańnie tekstavaha fajła" @@ -2441,20 +2195,12 @@ msgstr "Miescaznachodžańnie tekstavaha fajła" msgid "File uploads are not allowed on this server." msgstr "Zahruzki fajłaŭ nie dazvolenyja na hetym servery." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Niemahčyma adkryć paznačanuju vami tečku dla zahruzki fajłaŭ" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "tečka web-servera dla zahruzki fajłaŭ" @@ -2590,11 +2336,7 @@ msgstr "Sartavać pa klučy" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Nałady" @@ -2664,14 +2406,14 @@ msgstr "Pakazanyja zapisy" msgid "total" msgstr "usiaho" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Zapyt vykonvaŭsia %01.4f sek" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Źmianić" @@ -2741,11 +2483,7 @@ msgstr "Vykarystańnie pułu buferu" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Ahułam" @@ -3038,11 +2776,7 @@ msgstr "" "pierajmienavanyja i im budzie dadzieny čarhovy najvyšejšy numar." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Farmat" @@ -3114,13 +2848,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Dadzienyja" @@ -3169,15 +2898,9 @@ msgstr "MIME-typ" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Chost" @@ -3372,7 +3095,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "Adkryć novaje akno phpMyAdmin" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "" @@ -3384,7 +3107,7 @@ msgstr "SQL-vynik" msgid "Generated by" msgstr "Stvorany" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL viarnuła pusty vynik (to bok nul radkoŭ)." @@ -3530,20 +3253,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Pieršasny" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Indeks" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Poŭnatekstekstavaje" @@ -3768,6 +3491,10 @@ msgstr "Hety farmat nia maje opcyjaŭ" msgid "not OK" msgstr "nie OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Uklučana" @@ -3791,7 +3518,7 @@ msgstr "" "Za infarmacyjaj jak abnavić tablicu column_comments źviarniciesia, kali " "łaska, da dakumentacyi" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Zakładzieny SQL-zapyt" @@ -3842,13 +3569,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Imia karystalnika" @@ -3865,22 +3587,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Źmiennaja" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Značeńnie" @@ -3898,40 +3612,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Luby karystalnik" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Vykarystoŭvać tekstavaje pole" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Luby chost" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Lakalny" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Hety chost" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Vykarystoŭvać tablicu chostaŭ" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3955,7 +3640,6 @@ msgid "Use Host Table" msgstr "Vykarystoŭvać tablicu chostaŭ" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3989,29 +3673,29 @@ msgstr "Nieviadomaja mova: %1$s." msgid "Servers" msgstr "Servery" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Źmiennyja" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Kadyroŭki" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Mašyny" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Dvajkovy łog" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Pracesy" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -4038,51 +3722,51 @@ msgstr "" msgid "Target database" msgstr "" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Vykanać SQL-zapyt(y) na servery %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Vykanać SQL-zapyt(y) na bazie dadzienych %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Nazvy kalonak" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Dadać hety SQL-zapyt u zakładki" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Dać kožnamu karystalniku dostup da hetaj zakładki" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Zamianić isnuju zakładku z takim ža imiem" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Nie pierazapisvajcie hety zapyt u inšych voknach" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Raździalalnik" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Pakazać hety zapyt znoŭ " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Adpravić" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Tolki prahlad" @@ -4263,13 +3947,13 @@ msgstr "Aznačeńnie PARTITION" msgid "Save" msgstr "Zachavać" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "Dadać %s novyja pali" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4488,8 +4172,8 @@ msgstr "Skinuć" msgid "Protocol version" msgstr "Versija pratakołu" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Karystalnik" @@ -4940,119 +4624,119 @@ msgstr "Mašyny zachavańnia dadzienych" msgid "View dump (schema) of databases" msgstr "Prahladzieć damp (schiemu) bazaŭ dadzienych" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Uklučaje ŭsie pryvilei, aproč GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Dazvalaje źmianiać strukturu isnych tablic." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Dazvalaje źmianiać i vydalać pragramy, jakija zachoŭvajucca." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Dazvalaje stvarać novyja bazy dadzienych i tablicy." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Dazvalaje stvarać pragramy, jakija zachoŭvajucca." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Dazvalaje stvarać novyja tablicy." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Dazvalaje stvarać časovyja tablicy." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" "Dazvalaje stvarać, vydalać i pierajmianoŭvać ulikovyja zapisy karystalnikaŭ" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Dazvalaje stvarać novyja prahlady." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Dazvalaje vydalać dadzienyja." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Dazvalaje vydalać bazy dadzienych i tablicy." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Dazvalaje vydalać tablicy." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Dazvalaje stvarać padziei ŭ planiroŭniku padziejaŭ" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Dazvalaje vykanańnie pragramaŭ, jakija zachoŭvajucca." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "" "Dazvalaje impartavać dadzienyja z fajłaŭ i ekspartavać dadzienyja ŭ fajły." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Dazvalaje dadavać karystalnikaŭ i pryvilei biez pierazahruzki tablic " "pryvilejaŭ." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Dazvalaje stvarać i vydalać indeksy." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Dazvalaje ŭstaŭlać i zamianiać dadzienyja." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Dazvalaje blakavać tablicy dla biahučaha patoku." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Abmiažoŭvaje kolkaść novych złučeńniaŭ, jakija karystalnik moža adkryć na " "praciahu hadziny." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Abmiažoŭvaje kolkaść zapytaŭ, jakija karystalnik moža adpravić na server na " "praciahu hadziny." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5060,59 +4744,59 @@ msgstr "" "Abmiažoŭvaje kolkaść kamandaŭ, źmianiajučych lubuju tablicu abo bazu " "dadzienych, jakija karystalnik moža vykanać na praciahu hadziny." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "" "Abmiažoŭvaje kolkaść adnačasovych złučeńniaŭ, jakija moža mieć karystalnik." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Dazvalaje prahladać pracesy ŭsich karystalnikaŭ" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Nie pracuje ŭ hetaj versii MySQL." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "Dazvalaje pierazahružać nałady servera i ačyščać keš servera." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Dazvalaje karystalniku pytacca, dzie znachodziacca slaves / masters." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Nieabchodna dla replikacyi slaves." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Dazvalaje čytać dadzienyja." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Daje dostup da poŭnaha śpisu bazaŭ dadzienych." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Dazvalaje vykanańnie zapytaŭ SHOW CREATE VIEW." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Dazvalaje spyniać server." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5122,157 +4806,157 @@ msgstr "" "Patrabujecca dla bolšaści administratyŭnych aperacyjaŭ, takich jak " "vyznačeńnie hlabalnych źmiennych abo spynieńnie patokaŭ inšych karystalnikaŭ." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Dazvalaje stvareńnie i vydaleńnie tryhieraŭ" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Dazvalaje źmianiać dadzienyja." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Biez pryvilejaŭ." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Nijakaja" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Pryvilei, specyfičnyja dla tablicy" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Zaŭvaha: imiony pryvilejaŭ MySQL zadajucca pa-anhielsku " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Hlabalnyja pryvilei" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Specyfičnyja pryvilei bazy dadzienych" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administravańnie" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Abmiežavańni resursaŭ" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Zaŭvaha: Paznačeńnie hetych opcyjaŭ jak 0 (nul) zdymaje abmiežavańnie." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Infarmacyja pra ŭvachod" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Nie źmianiać parol" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Nie znojdzieny karystalnik." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Karystalnik %s užo isnuje!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Byŭ dadadzieny novy karystalnik." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Vy źmianili pryvilei dla %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Vy anulavali pryvilei dla %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Parol dla %s paśpiachova źmienieny." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Vydaleńnie %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Na vybranyja karystalniki dla vydaleńnia!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Pierazahruzić pryvilei" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Vybranyja karystalniki byli paśpiachova vydalenyja." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Pryvilei byli paśpiachova pierazahružanyja." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Redagavać pryvilei" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Anulavać" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Karystalniki" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Grant" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Luby" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Dadać novaha karystalnika" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Vydalić vybranych karystalnikaŭ" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Anulavać usie aktyŭnyja pryvilei karystalnikaŭ i paśla vydalić ich." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "" "Vydalić bazy dadzienych, jakija majuć takija ž imiony jak i karystalniki." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5285,96 +4969,96 @@ msgstr "" "jakija vykarystoŭvaje server, kali jany byli źmienienyja ŭručnuju. U hetym " "vypadku vam treba %spierazahruzić pryvilei%s da taho, jak vy praciahniecie." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Vyłučany karystalnik nia znojdzieny ŭ tablicy pryvilejaŭ." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Specyfičnyja pryvilei kalonak" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Dadać pryvilei na nastupnuju bazu" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Symbali padstanoŭki % i _ musiać być ekranavanymi symbalem \\ dla ich " "litaralnaha vykarystańnia" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Dadać pryvilei na nastupnuju tablicu" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Źmianić rehistracyjnuju infarmacyju / Kapijavać karystalnika" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Stvaryć novaha karystalnika z takimi ž pryvilejami i ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... pakinuć staroha." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... vydalić staroha z tablicy karystalnikaŭ." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... anulavać usie aktyŭnyja pryvilei staroha i paśla vydalić jaho." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" " ... vydalić staroha z tablicy karystalnikaŭ i paśla pierazahruzić pryvilei." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Baza dadzienych dla karystalnika" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Nijakaja" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" "Stvaryć bazu dadzienych z takim samym imiem i nadzialić usimi pryvilejami" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" "Nadzialić usimi pryvilejami bazy z imienami pa mascy (imia karystalnika_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Karystalniki z pravami dostupu da \"%s\"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "hlabalny" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "specyfičny dla bazy dadzienych" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "šablon" @@ -8093,25 +7777,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "ID ustaŭlenaha radku: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "U vyhladzie PHP-kodu" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "U vyhladzie SQL-zapytu" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Prablemy z indeksami dla tablicy `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Mietka" @@ -8163,13 +7847,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "i paśla" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Pierajści da papiaredniaj staronki" @@ -8250,7 +7927,7 @@ msgstr "(\"PRIMARY\" musić być imiem pieršasnaha kluča i tolki jaho!)" msgid "Add to index  %s column(s)" msgstr "Dadać da indeksa %s kalonku(i)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Kolkaść kalonak musić być bolšaj za nul." @@ -8364,41 +8041,6 @@ msgstr "Pravieryć cełasnaść dadzienych:" msgid "Show tables" msgstr "Pakazać tablicy" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Vykarystańnie prastory" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Vykarystańnie" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Efektyŭnaść" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Statystyka radku" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Vyrazy" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dynamičny" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Daŭžynia radka" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Vykarystańnie prastory" @@ -8432,7 +8074,6 @@ msgid "Row length" msgstr "Daŭžynia radka" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Pamier radka " @@ -8506,50 +8147,50 @@ msgstr "Nijakaja" msgid "Column %s has been dropped" msgstr "Tablica %s była vydalenaja" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Pieršasny kluč byŭ dadadzieny da %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Byŭ dadadzieny indeks dla %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Prahlad zaležnaściaŭ" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Prapanavanaja struktura tablicy" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "Dadać %s novyja pali" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "U kancy tablicy" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "U pačatku tablicy" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Paśla %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Stvaryć indeks na %s kalonkach" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "padzielenaja na sekcyi" @@ -8591,6 +8232,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8972,6 +8617,9 @@ msgstr "" #~ msgid "Process list" #~ msgstr "Śpis pracesaŭ" +#~ msgid "Reload privileges" +#~ msgstr "Pierazahruzić pryvilei" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/bg.po b/po/bg.po old mode 100755 new mode 100644 index 854606117..d0ee14f3b --- a/po/bg.po +++ b/po/bg.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-06-11 17:28+0200\n" "Last-Translator: \n" "Language-Team: bulgarian \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Покажи всички" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Търсене" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Изпълнение" @@ -114,7 +94,7 @@ msgstr "Използвахте тази стойност" msgid "Database %1$s has been created." msgstr "Базата данни %1$s беше създадена." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Коментар към базата от данни: " @@ -141,17 +121,10 @@ msgstr "Име на колона" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Тип" @@ -164,7 +137,7 @@ msgstr "Тип" msgid "Null" msgstr "Празно" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -188,24 +161,18 @@ msgstr "Сочи към" msgid "Comments" msgstr "Коментари" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "не" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -214,15 +181,9 @@ msgstr "не" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -241,142 +202,134 @@ msgstr "Схема на БД" msgid "No tables found in database." msgstr "В базата от данни няма таблици." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Селектиране на всичко" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Деселектиране на всичко" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Името на базата от данни е празно!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Базата данни %s беше преименувана на %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "База от данни %s беше копирана като %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Преименуване на базата от данни на" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Команда" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "и след това" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Копиране на базата от данни в" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Само структурата" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Структурата и данните" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Само данните" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "Изпълняване на CREATE DATABASE преди копирането" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Добавяне на %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Добавяне на AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Добавяне на ограничение" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Прехвърляна към копираната база от данни" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "BLOB хранилище" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Състояние" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Позволено" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "Забранено" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "Поправяне на таблицата" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Забранено" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "Позволено" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Колация" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -385,14 +338,14 @@ msgstr "" "Допълнителните възможности за работа със свързани (linked) таблици са " "деактивирани. За да разберете защо кликнете %sтук%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Редактиране на PDF Страници" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -401,11 +354,7 @@ msgstr "Таблица " #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Редове" @@ -413,42 +362,30 @@ msgstr "Редове" msgid "Size" msgstr "Размер" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "Заето" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Дата на създаване" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Последно обновление" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Последна проверка" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -509,11 +446,7 @@ msgstr "Изтрий" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "или" @@ -547,85 +480,85 @@ msgstr "Използвай таблицата" msgid "SQL query on database %s:" msgstr "SQL-заявка към базата от данни %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Изпълни заявката" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Отказан достъп" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "поне една от думите" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "всички думи" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "точната фраза" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "като регулярен израз" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Резултати от търсенето на \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s съвпадение(я) в таблица %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Прелистване" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Изтриване" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Общо: %s съвпадение(я)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Търсене в базата от данни" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Думи или стойности за търсене (знак за заместване: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Намери:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Думите трябва да се разделят с интервал (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "В таблиците:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -633,36 +566,36 @@ msgstr "В таблиците:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Вмъкване" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Структура" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Унищожаване" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Изчистване" @@ -672,117 +605,111 @@ msgstr "Изчистване" msgid "Table %s has been emptied" msgstr "Таблицата %s беше изчистена" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Изглед %s беше изтрит" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Таблицата %s беше изтрита" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Изглед" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Репликация" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Сума" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s е хранилището на данни по подразбиране на този MySQL сървър." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Когато има отметка:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Маркиране на всичко" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Размаркиране на всичко" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Маркиране на таблиците със загубено място" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Преглед за печат" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Проверка на таблицата" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Оптимизация на таблицата" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Поправяне на таблицата" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Анализиране на таблицата" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Експортиране" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Речник на данните" @@ -793,10 +720,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -817,8 +744,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Действие" @@ -854,8 +781,8 @@ msgstr "Само структурата" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Проверка на таблицата" @@ -936,7 +863,7 @@ msgstr "Показалецът беше изтрит." msgid "Showing bookmark" msgstr "" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Показалец %s беше създаден успешно" @@ -1017,295 +944,189 @@ msgstr "Името на хоста е празно!" msgid "The user name is empty!" msgstr "Потребителското име е празно!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Паролата е празна!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Паролата не е същата!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Добавяне на нов потребител." - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Версия на сървъра" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reloading the privileges" -msgid "Reloading Privileges" -msgstr "Презареждане на привилегиите" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Отстраняване на избраните потребители" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Локален" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Процеси" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Преименуване на базата от данни на" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "БД" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Копиране на базата от данни в" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Набор от знаци" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one column." -msgid "Table must have atleast 1 column" -msgstr "Таблицата трябва да има поне една колона." - -#: js/messages.php:70 -#, fuzzy -msgid "Create Table" -msgstr "Създай нова Страница" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Търсене" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Промените бяха съхранени" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 #, fuzzy msgid "Relation deleted" msgstr "Преглед на релациите" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 #, fuzzy msgid "Internal relation added" msgstr "Вътрешни релации" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Общи възможности на релациите" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Забранено" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Изберете Полета за показване" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "Няма" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Предишен" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Следващ" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Общо" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr " Двоично " -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "март" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "април" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "май" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "юни" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "юли" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "август" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "октомври" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "януари" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "февруари" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "март" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "април" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1313,176 +1134,176 @@ msgid "May" msgstr "май" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "юни" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "юли" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "август" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "септември" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "октомври" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "ноември" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "декември" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "нд" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "пн" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "вт" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "пт" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "нд" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "пн" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "вт" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "ср" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "чт" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "пт" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "сб" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "нд" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "пн" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "вт" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "ср" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "чт" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "пт" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "сб" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "Заето" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1540,7 +1361,7 @@ msgstr "Индекси" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Уникално" @@ -1559,7 +1380,7 @@ msgid "Comment" msgstr "Коментари" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1582,8 +1403,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Бази от данни" @@ -1751,11 +1572,7 @@ msgstr "Парола:" msgid "Server Choice" msgstr "Избор на сървър" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Оттук нататък са необходими \"Cookies\"." @@ -1837,11 +1654,7 @@ msgstr "" "докато протоколите за разширенията са заредени. Проверете конфигурацията на " "PHP." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Ако се " "изведе празна страница, всички е наред." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Конфигурацията по подразбиране не може да бъде заредена от: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1879,47 +1684,27 @@ msgstr "" "На $cfg['PmaAbsoluteUri'] ТРЯБВА да се зададе стойност в " "конфигурационния файл!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Сървър" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Трябва да ъпгрейднете към %s %s или по-късно." @@ -1947,7 +1732,7 @@ msgstr "Изпратени" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Документация" @@ -1961,138 +1746,138 @@ msgstr "SQL заявка" msgid "MySQL said: " msgstr "MySQL отговори: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Explain SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Пропусни Explain SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "без PHP код" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Създаване на PHP код" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Презареждане" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Пропусни Validate SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Валидирай SQL-а" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Хранилища" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Време" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "байта" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "КБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "МБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "ГБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "ТБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "ПБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "ЕБ" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%e %B %Y в %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s дена, %s часа, %s минути и %s секунди" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Начало" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Предишен" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Край" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Скочи към база от данни "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2112,7 +1897,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Име" @@ -2140,15 +1925,15 @@ msgstr "Запитване по пример" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Импортиране" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Привилегии" @@ -2167,11 +1952,7 @@ msgid "" msgstr "Може да има приблизителна стойност. Виж FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Загубено място" @@ -2188,7 +1969,7 @@ msgstr "Няма отговор от сървъра" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2198,36 +1979,22 @@ msgid "Change password" msgstr "Смяна на паролата" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Без парола" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Парола" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Отново" @@ -2242,20 +2009,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 съвместимо" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Генериране на парола" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Генериране" @@ -2268,17 +2027,21 @@ msgstr "Създаване на нова БД" msgid "Create" msgstr "Създай" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Няма привилегии" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +msgid "Table must have at least one column." +msgstr "Таблицата трябва да има поне една колона." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Създаване на нова таблица в БД %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 msgid "Number of columns" msgstr "Брой колони" @@ -2339,11 +2102,7 @@ msgid "remember template" msgstr "запомняне на шаблона" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Набор от знаци на файла:" @@ -2354,7 +2113,7 @@ msgstr "Компресия" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Няма" @@ -2396,11 +2155,7 @@ msgstr "" msgid "File to import" msgstr "Файл за импортиране" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Местоположение на текстовия файл" @@ -2408,20 +2163,12 @@ msgstr "Местоположение на текстовия файл" msgid "File uploads are not allowed on this server." msgstr "На този сървър не е позволени качване на файлове." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Директорията която сте указали за upload не може да бъде достигната" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "директорията за upload на уеб сървъра" @@ -2552,11 +2299,7 @@ msgstr "Сортиране по ключ" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "Операции" @@ -2628,14 +2371,14 @@ msgstr "Показване на записи " msgid "total" msgstr "Общо" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Заявката отне %01.4f секунди" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Променяне" @@ -2702,11 +2445,7 @@ msgstr "" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Общо" @@ -2954,11 +2693,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Формат" @@ -3030,13 +2765,8 @@ msgstr "" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Данни" @@ -3085,15 +2815,9 @@ msgstr "MIME-тип" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Хост" @@ -3291,7 +3015,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "Отваряне на нов прозорец с phpMyAdmin" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Няма таблици" @@ -3304,7 +3028,7 @@ msgstr "SQL резултат" msgid "Generated by" msgstr "Генерирано от" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL върна празен резултат (т.е. нула редове)." @@ -3453,20 +3177,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "PRIMARY" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Индекс" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Пълнотекстово" @@ -3691,6 +3415,10 @@ msgstr "Този формат няма опции" msgid "not OK" msgstr "не е OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Позволено" @@ -3714,7 +3442,7 @@ msgstr "" "Моля прегледайте информацията в Документацията относно това как да обновите " "вашата Column_comments таблица" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Запазване на SQL заявка" @@ -3765,13 +3493,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Потребителско име" @@ -3789,22 +3512,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Променлива" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Стойност" @@ -3823,40 +3538,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Всеки потребител" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Използвай текстовото поле" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Всеки хост" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Локален" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Този Хост" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Използвай таблица Host" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3880,7 +3566,6 @@ msgid "Use Host Table" msgstr "Използвай таблица Host" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3914,30 +3599,30 @@ msgstr "" msgid "Servers" msgstr "Сървъри" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Променливи" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Набори от знации" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Хранилища" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 #, fuzzy msgid "Binary log" msgstr " Двоично " -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Процеси" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Синхронизиране" @@ -3966,51 +3651,51 @@ msgstr "" msgid "Target database" msgstr "Търсене в базата от данни" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Изпълняване на SQL заявка/заявки на сървър %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Изпълнение на SQL заявка/заявки към база от данни %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Име на колона" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Запази тази SQL заявка" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Нека всеки потребител има достъп до този показалец" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Препокриване не съществуващия показалец със същото име" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Не препокривайте тази заявка извън този прозорец" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Разделител" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Показване на заявката отново" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Изпълнение" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Само показване" @@ -4190,13 +3875,13 @@ msgstr "" msgid "Save" msgstr "Записване" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "Добавяне на %s поле(та)" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4389,8 +4074,8 @@ msgstr "Изчистване" msgid "Protocol version" msgstr "Версия на протокола" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Потребител" @@ -4826,118 +4511,118 @@ msgstr "Хранилища на данни" msgid "View dump (schema) of databases" msgstr "Преглед на схемата на базата от данни" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Включва всички привилегии освен GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Позволява променяне на структурата на съществуващи таблици." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Позволяване на променяне и издриване на Съхранени Процедури." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Позволява създаване на нови бази от данни и таблици." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Позволяване на създаването на Съхранени Процедури." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Позволява създаване на нови таблици." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Позволява създаването на временни таблици." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" "Позволяване на създаването, изтриването и преименуването на потребителски " "акаунти." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Позволяване на създаването на нови Изгледи." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Позволява изтриване на данни." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Позволява изтриване на бази от данни и таблици." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Позволява изтриване на таблици." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Позволяване на стартирането на Съхранени Процедури." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Позволява импортиране на данни от и експортиране на данни във файлове." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Позволява добавяне на потребители и привилегии без презареждане на таблицата " "с привилегиите." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Позволява създаване и премахване на индекси." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Позволява вмъкване и заменяне на данни." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Позволява заключване на таблици за текущата нишка." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Ограничава броя на новите конекции, които потребителя може да отвори на час." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Ограничава броя на заявките, които потребителя може да изпрати към сървъра " "на час." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4945,62 +4630,62 @@ msgstr "" "Ограничава броя на командите, които променят някоя таблица или база от " "данни, които даден потребител може да стартира за час." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 #, fuzzy msgid "Limits the number of simultaneous connections the user may have." msgstr "" "Ограничава броя на новите конекции, които потребителя може да отвори на час." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Няма ефект в тази версия на MySQL." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Позволява презареждане на сървърните настройки и изчистване(flashing) на " "кеша на сървъра." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Дава правото на потребител да знае къде са slaves / masters." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Нужно за replication slaves." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Позволява четене на данни." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Дава достъп до пълния списък на базите данни." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Позволяване на изпълнението на SHOW CREATE VIEW заявки." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Позволява спиране на сървъра." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5010,161 +4695,161 @@ msgstr "" "Изисква се за повечето административни операции, като установяване на " "глобални променливи или спиране на нишка на други потребители." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "Позволява създаване и премахване на индекси." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Позволява промяна на данни." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Няма привилегии." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Няма" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Привилегии специфични за таблицата" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr "" " Забележка: Имената на привилегиите на MySQL са показани на английски. " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Глобални привилегии" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Привилегии специфични за базата от данни" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Администрация" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Ресурсни ограничения" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" "Забележка: Установяването на тези опции с 0 (нула) премахва ограничението." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Информация за логване" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Да не се сменя паролата" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Няма потребител(и)." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Потребител %s вече съществува!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Вие добавихте нов потребител." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Вие променихте привилегиите за %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Вие отменихте привилегиите за %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Паролата на %s беше променена успешно." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Изтриване на %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Не за избрани потребители за изтриване!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Презареждане на привилегиите" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Избраните потребители бяха изтрити успешно." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Привилегиите бяха презаредени успешно." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Редактиране на привилегиите" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Отменяне" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Преглед на потребителите" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Дадени" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "всеки" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Добавяне на нов потребител." -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Отстраняване на избраните потребители" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Отмяна на всички активни привилегии от потребителите и след това изтриване." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "" "Изтриване на базите от данни които имат имена като тези на потребителите." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5178,49 +4863,49 @@ msgstr "" "ръка. В този случай, трябва да %sпрезаредите привилегиите%s преди да " "продължите." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Избрания потребител не беше открит в таблицата с привилегиите." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Привилегии специфични за колоната" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Добавяне на привилегии към следната база от данни" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Добавяне на привилегии към следната таблица" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Промяна на логин информацията / Копиране на потребител" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Създаване нов потребител със същите привилегии и ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... запазване на стария." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... изтриване на стария от таблицата на потребителите." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... отменяне на всички активни привилегии от стария и след това изтриване." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5228,44 +4913,44 @@ msgstr "" " ... изтриване на стария от таблицата на потребителите и след това " "презареждане на привилегиите." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "База от данни за потребителя" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Няма" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Създаване на база от данни със същото име и даване на пълни привилегии" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "Даване на пълни привилегии над база от данни "%s"." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Потребители които имат достъп до "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "глобален" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "специфични за базата от данни" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "знак за заместване" @@ -7901,25 +7586,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Показване като PHP-код" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Проблем с индексите на таблица `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Етикет" @@ -7971,13 +7656,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "и след това" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "връщане обратно" @@ -8060,7 +7738,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "  %s колона(и) беше(яха)добавени към индекса " -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Броя на колоните трябва да е по-голям от нула." @@ -8177,41 +7855,6 @@ msgstr "Проверка на интегритета на връзките" msgid "Show tables" msgstr "Покажи таблиците" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Използвано място" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Използвани" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Ефективни" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Статистика за редовете" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Заявление" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "динамичен" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Дължина на реда" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Използвано място" @@ -8245,7 +7888,6 @@ msgid "Row length" msgstr "Дължина на реда" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Размер на ред " @@ -8318,50 +7960,50 @@ msgstr "Няма" msgid "Column %s has been dropped" msgstr "Таблицата %s беше изтрита" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Беше добавен първичен ключ към %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Беше добавен индекс на %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Преглед на релациите" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Анализ на таблицата" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "Добавяне на %s поле(та)" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "в края на таблицата" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "в началото на таблицата" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "след %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Създаване на индекс върху  %s колони" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8403,6 +8045,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/bn.po b/po/bn.po old mode 100755 new mode 100644 index fd41b4544..be089cde0 --- a/po/bn.po +++ b/po/bn.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:11+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: bangla \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Show all" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "খুঁজুন" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Go" @@ -113,7 +93,7 @@ msgstr "Use this value" msgid "Database %1$s has been created." msgstr "%s ডাটাবেজ মুছে ফেলা হয়েছে" -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "ডাটাবেজ মন্তব্যসমূহঃ" @@ -140,17 +120,10 @@ msgstr "কলামের নাম" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Type" @@ -163,7 +136,7 @@ msgstr "Type" msgid "Null" msgstr "খালি" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -187,24 +160,18 @@ msgstr "Links to" msgid "Comments" msgstr "মন্তব্যসমূহ" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "না" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -213,15 +180,9 @@ msgstr "না" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -240,142 +201,134 @@ msgstr "View dump (schema) of database" msgid "No tables found in database." msgstr "No tables found in database." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "সব সিলেক্ট করুন" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Unselect All" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "ডাটাবেজ এর নাম দেওয়া হয়নি" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Database %s has been renamed to %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "%s ডাটাবেজ় %s তে কপি করা হয়েছে" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "ডাটাবেজ রিনেম কর" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "নির্দেশ" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "এবং তারপর" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "ডাটাবেজ কপি করঃ" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Structure only" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Structure and data" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "শুধু ডাটা" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "কপি করার আগে ডাটাবেজ় তৈরী কর" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Add %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Add AUTO_INCREMENT value" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Add constraints" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Switch to copied database" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "অবস্থা" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Enabled" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "বন্ধ করা হয়েছে" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "টেবিল রিপেয়ার করুন" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "বন্ধ করা হয়েছে" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "Enabled" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Collation" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -384,14 +337,14 @@ msgstr "" "The additional features for working with linked tables have been " "deactivated. To find out why click %shere%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "পিডিএফ পাতাগুলো সম্পাদনা কর" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -400,11 +353,7 @@ msgstr "টেবিল" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Rows" @@ -412,42 +361,30 @@ msgstr "Rows" msgid "Size" msgstr "আকার" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "in use" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Creation" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "সর্বশেষ আপডেট" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Last check" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -508,11 +445,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "অথবা" @@ -546,85 +479,85 @@ msgstr "টেবিল ব্যাবহারকারী" msgid "SQL query on database %s:" msgstr "SQL query on database %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Submit Query" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "প্রবেশ নিষেধ" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "at least one of the words" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "সব শব্দ" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "the exact phrase" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "as regular expression" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Search results for \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s match(es) inside table %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "ব্রাউজ করুন" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "মুছে ফেল" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Total: %s match(es)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "ডাটাবে এ খুজুঁনSearch in database" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Word(s) or value(s) to search for (wildcard: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Find:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Words are separated by a space character (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Inside table(s):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -632,36 +565,36 @@ msgstr "Inside table(s):" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Insert" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Structure" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "মুছে ফেল" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "খালি" @@ -671,117 +604,111 @@ msgstr "খালি" msgid "Table %s has been emptied" msgstr "Table %s has been emptied" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "View %s has been dropped" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Table %s has been dropped" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "View" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replication" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "যোগফল" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s MySQL সার্ভার এর ডিফল্ট ষ্টোরেজ ইঞ্জিন" -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "With selected:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "সব পরীক্ষা করুন" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Uncheck All" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "ওভারহেড সহ টেবিল পরীক্ষা কর" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Print view" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "টেবিল পরীক্ষা কর" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "টেবিল অপটিমাইজ করুন" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "টেবিল রিপেয়ার করুন" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "টেবিল বিশ্লেষণ কর" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Export" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "ডাটা অভিধান" @@ -793,10 +720,10 @@ msgstr "টেবিল পরীক্ষা কর" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -818,8 +745,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Action" @@ -856,8 +783,8 @@ msgstr "Structure only" msgid "Untracked tables" msgstr "টেবিল পরীক্ষা কর" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "টেবিল পরীক্ষা কর" @@ -940,7 +867,7 @@ msgstr "বুকমার্কটি মুছে ফেলা হয়েছে msgid "Showing bookmark" msgstr "বুকমার্ক দেখান" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "বুকমার্ক %s তৈরী করা হয়েছে" @@ -1023,294 +950,188 @@ msgstr "হোষ্ট নাম পূরন করা হয়নি" msgid "The user name is empty!" msgstr "The user name is empty!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "পাসওয়ার্ড দেওয়া হয়নি" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "The passwords aren't the same!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "একটি নতুন ইউজার যোগ করুন" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Server version" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Reload privileges" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Remove selected users" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "লোকাল" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Processes" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "ঠিক আছে" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "ডাটাবেজ রিনেম কর" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "ডাটাবেজ" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "ডাটাবেজ কপি করঃ" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Charset" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Table must have at least one field." - -#: js/messages.php:70 -#, fuzzy -msgid "Create Table" -msgstr "একটি নতুন পাতা তৈরী কর" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "খুঁজুন" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Modifications have been saved" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 #, fuzzy msgid "Relation deleted" msgstr "Relation view" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 #, fuzzy msgid "Internal relation added" msgstr "Internal relations" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "General relation features" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "বন্ধ করা হয়েছে" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "প্রদর্শনের জন্য ক্ষেত্র পছন্দ কর" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy msgid "Done" msgstr "ডাটা" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "পূর্ববর্তী" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "পরবর্তী" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "মোট" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "বাইনারী" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "মার্চ" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "এপ্রিল" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "মে" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "জুন" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "জুলাই" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "আগস্ট" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "অক্টোবর" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "জানুয়ারী" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "ফেব্রুয়ারী" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "মার্চ" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "এপ্রিল" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1318,176 +1139,176 @@ msgid "May" msgstr "মে" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "জুন" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "জুলাই" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "আগস্ট" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "সেপ্টেমবর" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "অক্টোবর" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "নভেম্বর" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "ডিসেম্বর" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "রবিবার" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "সোমবার" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "মঙ্গলবার" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "শুক্রবার" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "রবিবার" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "সোমবার" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "মঙ্গলবার" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "বুধবার" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "বৃহস্পতিবার" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "শুক্রবার" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "শনিবার" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "রবিবার" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "সোমবার" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "মঙ্গলবার" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "বুধবার" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "বৃহস্পতিবার" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "শুক্রবার" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "শনিবার" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "in use" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1545,7 +1366,7 @@ msgstr "ইন্ডেস্ক সমূহ" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unique" @@ -1564,7 +1385,7 @@ msgid "Comment" msgstr "মন্তব্যসমূহ" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1587,8 +1408,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "ডাটাবেজসমূহ Databases" @@ -1759,11 +1580,7 @@ msgstr "পাসওয়ার্ড" msgid "Server Choice" msgstr "Server Choice" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Cookies must be enabled past this point." @@ -1843,11 +1660,7 @@ msgstr "" "Couldn't use either the iconv, libiconv or recode_string functions, although " "the necessary extensions appear to be loaded. Check your PHP configuration." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
If you receive a blank page, everything " "is fine." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "\"%1$s\" হতে ডিফল্ট কনফিগারেশন লোড করা যায়নি" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1885,48 +1690,28 @@ msgstr "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Invalid server index: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "Invalid hostname for server %1$s. Please review your configuration." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "সার্ভার" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Invalid authentication method set in configuration:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Invalid authentication method set in configuration:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "You should upgrade to %s %s or later." @@ -1953,7 +1738,7 @@ msgstr "bn" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "বর্ণনা" @@ -1967,138 +1752,138 @@ msgstr "SQL query" msgid "MySQL said: " msgstr "MySQL said: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "SQL ব্যাখ্যা কর" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Skip Explain SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "PHP কোড ছাড়া" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "PHP কোড তৈরী করুনCreate PHP Code" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Refresh" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Skip Validate SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Validate SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "ইঞ্জিনসমূহ" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "সময়" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "বাইট" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "কিলোবাইট" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "মেগাবাইট" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "গিগাবাইট" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "টেরাবাইট" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "পেটাবাইট" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "এক্সাবাইট" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%B %d, %Y at %I:%M %p" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s দিন, %s মাস, %s মিনিট and %s সেকেণ্ড" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "শুরু" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "পূর্ববর্তী" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "End" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Jump to database "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2122,7 +1907,7 @@ msgid "Events" msgstr "Sent" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "নাম" @@ -2150,15 +1935,15 @@ msgstr "Query" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "ইম্পোর্ট কর" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privileges" @@ -2177,11 +1962,7 @@ msgid "" msgstr "হয়ত আনুমানিক। FAQ ৩.১১ দেখ। " #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Overhead" @@ -2198,7 +1979,7 @@ msgstr "The server is not responding" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(or the local MySQL server's socket is not correctly configured)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2208,36 +1989,22 @@ msgid "Change password" msgstr "পাসওয়ার্ড পরিবর্তন কর" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "কোন পাসওয়ার্ড নাই" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "পাসওয়ার্ড" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Re-type" @@ -2252,20 +2019,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 compatible" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "পাসওয়ার্ড তৈরী কর" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "তৈরী কর" @@ -2278,17 +2037,23 @@ msgstr "নতুন ডাটাবেজ় তৈরী কর" msgid "Create" msgstr "তৈরী করুন" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "কোন সুবিধা নাই" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Table must have at least one field." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "%s ডাটাবেজ় এ নতুন টেবিল তৈরী কর" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2353,11 +2118,7 @@ msgid "remember template" msgstr "টেমপ্লেট মনে রাখ" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "ফাইল এর অক্ষরসমূহঃ" @@ -2368,7 +2129,7 @@ msgstr "সংকোচন" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "কোনটিই নয়" @@ -2410,11 +2171,7 @@ msgstr "" msgid "File to import" msgstr "ইম্পোর্ট করার জন্য ফাইল" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Location of the text file" @@ -2422,20 +2179,12 @@ msgstr "Location of the text file" msgid "File uploads are not allowed on this server." msgstr "File uploads are not allowed on this server." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "The directory you set for upload work cannot be reached" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "web server upload directory" @@ -2570,11 +2319,7 @@ msgstr "Sort by key" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "Operations" @@ -2646,14 +2391,14 @@ msgstr "Showing rows" msgid "total" msgstr "মোট" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Query took %01.4f sec" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Change" @@ -2723,11 +2468,7 @@ msgstr "Buffer Pool Usage" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "মোট" @@ -2988,11 +2729,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "ফরমেট" @@ -3064,13 +2801,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "ডাটা" @@ -3119,15 +2851,9 @@ msgstr "মাইম এর ধরন" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "হোষ্ট" @@ -3328,7 +3054,7 @@ msgstr "Export type" msgid "Open new phpMyAdmin window" msgstr "Open new phpMyAdmin window" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "কোন টেবিল নাই" @@ -3341,7 +3067,7 @@ msgstr "SQL result" msgid "Generated by" msgstr "Generated by" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL returned an empty result set (i.e. zero rows)." @@ -3492,20 +3218,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "প্রাথমিক" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "ইন্ডেস্ক" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Fulltext" @@ -3730,6 +3456,10 @@ msgstr "This format has no options" msgid "not OK" msgstr "ঠিক নাই" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "ঠিক আছে" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Enabled" @@ -3752,7 +3482,7 @@ msgid "" msgstr "" "Please see the documentation on how to update your column_comments table" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "বুকমার্ক করা SQL query" @@ -3803,13 +3533,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "ব্যাভারকারীর নাম" @@ -3829,22 +3554,14 @@ msgstr "Show slave status" msgid "Slave status" msgstr "Show slave status" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "চলক" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "মান" @@ -3862,40 +3579,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "যেকোন ব্যাবহারকারী" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Use text field" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "যেকোন হোষ্ট" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "লোকাল" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "This Host" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Use Host Table" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3919,7 +3607,6 @@ msgid "Use Host Table" msgstr "Use Host Table" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3953,29 +3640,29 @@ msgstr "Unknown language: %1$s." msgid "Servers" msgstr "সার্ভারসমূহ" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "চলকসমূহ" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Charsets" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "ইঞ্জিনসমূহ" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "বাইনারী লগ" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Processes" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -4004,51 +3691,51 @@ msgstr "" msgid "Target database" msgstr "ডাটাবে এ খুজুঁনSearch in database" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Run SQL query/queries on server %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Run SQL query/queries on database %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "কলামের নাম" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "এই SQL query টি বুকমার্ক করুন" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "সব ব্যাক্তিকে এই বুকমার্কটি দেখার সুযোগ দিন" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "একই নামের বর্তমান বুকমার্ক প্রতিস্থাপন করুন" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Do not overwrite this query from outside the window" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Delimiter" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Show this query here again " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Submit" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "শুধু দেখ" @@ -4225,13 +3912,13 @@ msgstr "" msgid "Save" msgstr "সেভ করুন" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr " %s ক্ষেত্রসমূহ যোগ কর" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4444,8 +4131,8 @@ msgstr "রিসেট করুন" msgid "Protocol version" msgstr "Protocol version" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "User" @@ -4891,112 +4578,112 @@ msgstr "Storage Engines" msgid "View dump (schema) of databases" msgstr "View dump (schema) of databases" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Includes all privileges except GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Allows altering the structure of existing tables." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Allows altering and dropping stored routines." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Allows creating new databases and tables." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Allows creating stored routines." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Allows creating new tables." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Allows creating temporary tables." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Allows creating, dropping and renaming user accounts." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Allows creating new views." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Allows deleting data." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Allows dropping databases and tables." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Allows dropping tables." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Allows executing stored routines." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Allows importing data from and exporting data into files." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Allows adding users and privileges without reloading the privilege tables." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Allows creating and dropping indexes." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Allows inserting and replacing data." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Allows locking tables for the current thread." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Limits the number of new connections the user may open per hour." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Limits the number of queries the user may send to the server per hour." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5004,58 +4691,58 @@ msgstr "" "Limits the number of commands that change any table or database the user may " "execute per hour." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Limits the number of simultaneous connections the user may have." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Has no effect in this MySQL version." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "Allows reloading server settings and flushing the server's caches." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Allows the user to ask where the slaves / masters are." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Needed for the replication slaves." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Allows reading data." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Gives access to the complete list of databases." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Allows performing SHOW CREATE VIEW queries." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Allows shutting down the server." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5065,160 +4752,160 @@ msgstr "" "required for most administrative operations like setting global variables or " "killing threads of other users." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "Allows creating and dropping indexes." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Allows changing data." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "No privileges." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "কোনটিই নয়" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Table-specific privileges" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr "" "নোটঃ MySQL সুবিধাসমূহের নাম ইংরেজীতে প্রকাশ করা হয় Note: MySQL privilege " "names are expressed in English " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Global privileges" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "ডাটাবেজ-নির্দিষ্ট সুবিধাসমূহ" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administration" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Resource limits" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Note: Setting these options to 0 (zero) removes the limit." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Login Information" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Do not change the password" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "No user(s) found." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "The user %s already exists!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "আপনি একটি নতুন ইউজার যোগ করেছেন" -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "You have updated the privileges for %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "You have revoked the privileges for %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "The password for %s was changed successfully." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "%s মুছে ফেলা হচ্ছে" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "মুছে ফেলার জন্য কোন ব্যাবহারকারী চিহ্নিত করা হয়নি" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Reloading the privileges" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "The selected users have been deleted successfully." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "The privileges were reloaded successfully." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "সুবিধাসমূহ সম্পাদনা কর" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Revoke" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "User overview" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Grant" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "যেকোন" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "একটি নতুন ইউজার যোগ করুন" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Remove selected users" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Revoke all active privileges from the users and delete them afterwards." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "ব্যাবহারকারীর নামে নাম এমন ডাটাবেজসমূহ মুছে ফেল" -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5231,51 +4918,51 @@ msgstr "" "server uses, if they have been changed manually. In this case, you should %" "sreload the privileges%s before you continue." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "The selected user was not found in the privilege table." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "কলাম নির্দিষ্ট সুবিধাসমূহ" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "নিচের ডাটাবেইজ এ সুবিধাসমূহ যোগ কর" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "Wildcards % and _ should be escaped with a \\ to use them literally" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "নিচের টেবিল এ সুবিধাসমূহ যোগ কর" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "" "লগ ইন তথ্য পরিবর্তন কর অথবা ব্যাবহারকারী কপি করChange Login Information / Copy " "User" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "একই সুবিধা সহ নতুন আরেকটি ব্যাবহারকারী তৈরী করুন..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... পুরাতনটা রেখে দাও" -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ...ব্যাবহারকারীর টেবিলগুলো থেকে পুরাতনটি মুছে ফেল" -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... revoke all active privileges from the old one and delete it afterwards." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5283,46 +4970,46 @@ msgstr "" " ... ব্যাবহারকারীর টেবিলগুলো থেকে পুরাতনটি মুছে ফেল এবং এরপর সুবিধাসমূহ পুনরায় লোড " "কর" -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "ব্যাবহারকারীর জন্য ডাটাবেজ" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "কোনটিই নয়" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" "একই নামে ডাটাবেজ তৈরী কর এবং সকল সুবিধাসমূহ মঞ্জুর করCreate database with same " "name and grant all privileges" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Grant all privileges on wildcard name (username_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "Check privileges for database "%s"." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Users having access to "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "global" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "ডাটাবেজ-নির্দিষ্ট" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "wildcard" @@ -8074,26 +7761,26 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 #, fuzzy msgid "Showing SQL query" msgstr "Show Full Queries" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Problems with indexes of table `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "লেবেল" @@ -8145,13 +7832,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "এবং তারপর" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "পূর্বের পাতায় ফিরে যাও" @@ -8232,7 +7912,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Index এ যোগ কর  %s column(s)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Column count has to be larger than zero." @@ -8349,41 +8029,6 @@ msgstr "Check referential integrity:" msgid "Show tables" msgstr "Show tables" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Space usage" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "ব্যাবহার" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Effective" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Row Statistics" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Statements" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "ডায়নামিক" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "সাড়ির দৈর্ঘ্য" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Space usage" @@ -8417,7 +8062,6 @@ msgid "Row length" msgstr "সাড়ির দৈর্ঘ্য" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " সাড়ির আকার" @@ -8489,50 +8133,50 @@ msgstr "কোনটিই নয়" msgid "Column %s has been dropped" msgstr "Table %s has been dropped" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "একটি প্রাইমারী কী যোগ করা হয়েছে %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "একটি Index যোগ করা হয়েছে %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Relation view" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Propose table structure" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr " %s ক্ষেত্রসমূহ যোগ কর" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "টেবিলের শেষে" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "টেবিলের শুরুতে" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "After %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Create an index on %s columns" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8574,6 +8218,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8973,6 +8621,9 @@ msgstr "টেবিল রিনেম করুন" #~ msgid "Process list" #~ msgstr "Process list" +#~ msgid "Reload privileges" +#~ msgstr "Reload privileges" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/bs.po b/po/bs.po old mode 100755 new mode 100644 index ba317f0fd..751eacfd9 --- a/po/bs.po +++ b/po/bs.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: bosnian \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Prikaži sve" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Pretraživanje" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Kreni" @@ -113,7 +93,7 @@ msgstr "Koristi ovu vrijednost" msgid "Database %1$s has been created." msgstr "Baza %s je odbačena." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Komentar baze:" @@ -140,17 +120,10 @@ msgstr "Imena kolona" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Tip" @@ -163,7 +136,7 @@ msgstr "Tip" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -187,24 +160,18 @@ msgstr "Veze ka" msgid "Comments" msgstr "Komentari" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Ne" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -213,15 +180,9 @@ msgstr "Ne" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -240,146 +201,138 @@ msgstr "Prikaži sadržaj (shemu) baze" msgid "No tables found in database." msgstr "Tabele nisu pronađene u bazi." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Izaberi sve" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "ništa" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 #, fuzzy msgid "The database name is empty!" msgstr "Ima tabele je prazno!" -#: db_operations.php:241 +#: db_operations.php:236 #, fuzzy, php-format msgid "Database %s has been renamed to %s" msgstr "Tabeli %s promjenjeno ime u %s" -#: db_operations.php:245 +#: db_operations.php:240 #, fuzzy, php-format msgid "Database %s has been copied to %s" msgstr "Tabela %s je kopirana u %s." -#: db_operations.php:423 +#: db_operations.php:412 #, fuzzy msgid "Rename database to" msgstr "Promjeni ime tabele u " -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Naredba" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "" #: db_operations.php:455 ->>>>>>> origin/master #, fuzzy msgid "Copy database to" msgstr "Baza ne postoji" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Samo struktura" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Struktura i podatci" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Samo podaci" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Dodaj AUTO_INCREMENT vrijednost" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "" -#: db_operations.php:507 +#: db_operations.php:496 #, fuzzy msgid "Switch to copied database" msgstr "Pređi na kopiranu tabelu" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Status" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Omogućeno" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "Onemogućeno" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "Popravi tabelu" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Onemogućeno" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "Omogućeno" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Sortiranje" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -388,14 +341,14 @@ msgstr "" "Dodatne mogućnosti za rad sa povezanim tabelama su isključene. Da biste " "saznali zašto, kliknite %sovde%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Izmena PDF strana" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -404,11 +357,7 @@ msgstr "Tabela" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Redova" @@ -416,42 +365,30 @@ msgstr "Redova" msgid "Size" msgstr "Veličina" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "se koristi" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Napravljeno" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Posljednja izmjena" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Posljednja provjera" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -512,11 +449,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "ili" @@ -550,85 +483,85 @@ msgstr "Koristi tabele" msgid "SQL query on database %s:" msgstr "SQL upit na bazi %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Izvrši SQL upit" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Ulaz nije dozvoljen" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "bar jednu od riječi" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "sve riječi" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "tačan izraz" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "kao regularni izraz" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Rezultati pretrage za \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s pogodaka unutar tabele %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Pregled" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Obriši" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Ukupno: %s pogodaka" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Pretraživanje baze" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Riječi ili vrednosti koje se traže (džoker: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Traži:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Riječi se odvajaju razmakom (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Unutar tabela:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -636,36 +569,36 @@ msgstr "Unutar tabela:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Novi zapis" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Struktura" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Odbaci" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Isprazni" @@ -675,118 +608,112 @@ msgstr "Isprazni" msgid "Table %s has been emptied" msgstr "Tabela %s je ispražnjena" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, fuzzy, php-format msgid "View %s has been dropped" msgstr "Polje %s je obrisano" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Tabela %s je odbačena" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 #, fuzzy msgid "Replication" msgstr "Relacije" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Ukupno" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "" -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Označeno:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Označi sve" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "nijedno" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Za štampu" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Provjeri tabelu" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimiziraj tabelu" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Popravi tabelu" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analiziraj tabelu" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Izvoz" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Rečnik podataka" @@ -797,10 +724,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -821,8 +748,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Akcija" @@ -858,8 +785,8 @@ msgstr "Samo struktura" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Provjeri tabelu" @@ -936,7 +863,7 @@ msgstr "Obilježivač je upravo obrisan." msgid "Showing bookmark" msgstr "" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "" @@ -1015,292 +942,189 @@ msgstr "Ime hosta je prazno!" msgid "The user name is empty!" msgstr "Ime korisnika nije unijeto!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Lozinka je prazna!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Lozinke nisu identične!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Dodaj novog korisnika" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Verzija servera" - -#: js/messages.php:48 -#, fuzzy -msgid "Reloading Privileges" -msgstr "Globalne privilegije" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Ukloni izabrane korisnike" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Lokalni" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Procesi" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "U redu" - -#: js/messages.php:65 -#, fuzzy -msgid "Renaming Databases" -msgstr "Promjeni ime tabele u " - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Baza podataka" - -#: js/messages.php:67 -#, fuzzy -msgid "Copying Database" -msgstr "Baza ne postoji" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Karakter set" - -#: js/messages.php:69 -#, fuzzy -#| msgid "You have to choose at least one column to display" -msgid "Table must have atleast 1 column" -msgstr "Morate izabrati bar jednu kolonu za prikaz" - -#: js/messages.php:70 -#, fuzzy -msgid "Create Table" -msgstr "Napravi novu stranu" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Pretraživanje" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Izmjene su sačuvane" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 #, fuzzy msgid "Relation deleted" msgstr "Relacioni pogled" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 #, fuzzy msgid "Internal relation added" msgstr "Opšte osobine relacija" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Opšte osobine relacija" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Onemogućeno" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Izaberi polja za prikaz" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "nema" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Prethodna" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Slijedeći" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Ukupno" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Binarni" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "mar" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "apr" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "maj" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "jun" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "jul" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "aug" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "okt" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "jan" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "feb" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "apr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1308,176 +1132,176 @@ msgid "May" msgstr "maj" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "jun" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "jul" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "aug" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "sep" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "okt" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "nov" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "dec" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Ned" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Pon" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Uto" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Pet" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Ned" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Pon" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Uto" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Sri" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Čet" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Pet" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sub" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Ned" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Pon" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Uto" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Sri" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Čet" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Pet" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Sub" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "se koristi" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1534,7 +1358,7 @@ msgstr "Ključevi" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Jedinstveni" @@ -1553,7 +1377,7 @@ msgid "Comment" msgstr "Komentari" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1576,8 +1400,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Baze" @@ -1744,11 +1568,7 @@ msgstr "Lozinka:" msgid "Server Choice" msgstr "Izbor servera" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Kolačići (Cookies) moraju u ovom slučaju biti aktivirani." @@ -1828,11 +1648,7 @@ msgstr "" "Ne mogu da koristim iconv ili libiconv ili recode_string funkcije iako " "ekstenzija prijavljuje da je učitana. Proverite vašu PHP konfiguraciju." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Ako dobijete praznu stranu, sve je u redu." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1868,47 +1676,27 @@ msgstr "" "$cfg['PmaAbsoluteUri'] direktiva MORA biti podješena u " "konfiguracionoj datoteci!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Server" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "" @@ -1936,7 +1724,7 @@ msgstr "Poslato" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentacija" @@ -1950,136 +1738,136 @@ msgstr "SQL upit" msgid "MySQL said: " msgstr "MySQL kaže: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Objasni SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Preskoči objašnjavanje SQL-a" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "bez PHP koda" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Napravi PHP kod" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Preskoči provjeru SQL-a" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Provjeri SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Vrijeme" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "bajta" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d. %B %Y. u %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s dana, %s sati, %s minuta i %s sekundi" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Početak" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Prethodna" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Kraj" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Pređi na bazu "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2099,7 +1887,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Ime" @@ -2127,16 +1915,16 @@ msgstr "Upit po primeru" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 #, fuzzy msgid "Import" msgstr "Izvoz" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privilegije" @@ -2155,11 +1943,7 @@ msgid "" msgstr "" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Prekoračenje" @@ -2176,7 +1960,7 @@ msgstr "" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2186,36 +1970,22 @@ msgid "Change password" msgstr "Promeni lozinku" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Nema lozinke" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Lozinka" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Ponovite unos" @@ -2228,20 +1998,12 @@ msgid "MySQL 4.0 compatible" msgstr "" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master #, fuzzy msgid "Generate" msgstr "Generirao" @@ -2255,17 +2017,23 @@ msgstr "Napravi novu bazu podataka" msgid "Create" msgstr "Napravi" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Nema privilegija" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "You have to choose at least one column to display" +msgid "Table must have at least one column." +msgstr "Morate izabrati bar jednu kolonu za prikaz" + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Napravi novu tabelu u bazi %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of rows per page" msgid "Number of columns" @@ -2328,11 +2096,7 @@ msgid "remember template" msgstr "zapamti šablon" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Karakter set datoteke:" @@ -2343,7 +2107,7 @@ msgstr "Kompresija" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "nema" @@ -2385,11 +2149,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Lokacija tekstualne datoteke" @@ -2397,20 +2157,12 @@ msgstr "Lokacija tekstualne datoteke" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Direkcija koju ste izabrali za slanje nije dostupna" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "direkcija za slanje web servera " @@ -2539,11 +2291,7 @@ msgstr "" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "Operacije" @@ -2615,14 +2363,14 @@ msgstr "Prikaz zapisa" msgid "total" msgstr "ukupno" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Upit je trajao %01.4f sekundi" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Promijeni" @@ -2690,11 +2438,7 @@ msgstr "" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Ukupno" @@ -2940,11 +2684,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Format" @@ -3016,13 +2756,8 @@ msgstr "" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Podaci" @@ -3072,15 +2807,9 @@ msgstr "MIME-tipovi" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Host" @@ -3279,7 +3008,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Nema tabela" @@ -3292,7 +3021,7 @@ msgstr "SQL rezultat" msgid "Generated by" msgstr "Generirao" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL je vratio prazan rezultat (nula redova)." @@ -3439,20 +3168,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primarni" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Ključ" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Tekst ključ" @@ -3681,6 +3410,10 @@ msgstr "Ne postoje opcije za ovaj format" msgid "not OK" msgstr "nije u redu" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "U redu" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Omogućeno" @@ -3703,7 +3436,7 @@ msgid "" msgstr "" "Molimo pogledajte u dokumentaciji kako se ažurira tabela Column_comments" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Obilježen SQL-upit" @@ -3754,13 +3487,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Ime korisnika" @@ -3778,22 +3506,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Promjenljiva" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Vrijednost" @@ -3812,40 +3532,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Bilo koji korisnik" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Koristi tekst polje" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Bilo koji host" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Lokalni" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Ovaj server" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Koristi tabelu hosta" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3869,7 +3560,6 @@ msgid "Use Host Table" msgstr "Koristi tabelu hosta" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3904,30 +3594,30 @@ msgstr "" msgid "Servers" msgstr "Server" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Promjenljive" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Kodne strane" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 #, fuzzy msgid "Binary log" msgstr "Binarni" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Procesi" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3956,51 +3646,51 @@ msgstr "" msgid "Target database" msgstr "Pretraživanje baze" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, fuzzy, php-format msgid "Run SQL query/queries on server %s" msgstr "Izvrši SQL upit(e) na bazi %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Izvrši SQL upit(e) na bazi %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Imena kolona" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Obilježi SQL-upit" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Ne prepisuj ovaj upit izvan prozora" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr "Prikaži ponovo ovaj upit" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Pošalji" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Vidi samo" @@ -4176,12 +3866,12 @@ msgstr "" msgid "Save" msgstr "Sačuvaj" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format msgid "Add %s column(s)" msgstr "Dodaj novo polje" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to add at least one column." @@ -4364,8 +4054,8 @@ msgstr "Resetuj" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Korisnik" @@ -4800,116 +4490,116 @@ msgstr "" msgid "View dump (schema) of databases" msgstr "Prikaži sadržaj (shemu) baze" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Uključuje sve privilegije osim GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Dozvoljava izmjenu struktura postojećih tabela." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 #, fuzzy msgid "Allows altering and dropping stored routines." msgstr "Dozvoljava kreiranje i brisanje ključeva." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Dozvoljava kreiranje novih baza i tabela." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 #, fuzzy msgid "Allows creating stored routines." msgstr "Dozvoljava kreiranje novih tabela." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Dozvoljava kreiranje novih tabela." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Dozvoljava kreiranje privremenih tabela.." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 #, fuzzy msgid "Allows creating new views." msgstr "Dozvoljava kreiranje novih tabela." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Dozvoljava brisanje podataka." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Dozvoljava odbacivanje baza i tabela." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Dozvoljava odbacivanje tabela." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Dozvoljava uvoz podataka i njihov izvoz u datoteke." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Dozvoljava dodavanje korisnika i privilegija bez ponovnog učitavanja tabela " "privilegija." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Dozvoljava kreiranje i brisanje ključeva." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Dozvoljava umetanje i zamjenu podataka." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Dozvoljava zaključavanje tabela tekućim procesima." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Ograničava broj novih konekcija koje korisnik može ta otvori na sat." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Ograničava broj upita koje korisnik može da uputi serveru za sat." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4917,60 +4607,60 @@ msgstr "" "Ograničava broj komandi koje menjaju tabele ili baze koje korisnik može da " "izvrši na sat." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 #, fuzzy msgid "Limits the number of simultaneous connections the user may have." msgstr "Ograničava broj novih konekcija koje korisnik može ta otvori na sat." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Nema efekta u ovoj verziji MySQL-a." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Dozvoljava ponovno učitavanje podešavanja servera i pražnjenje keša servera." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Daje pravo korisniku da pita gde su glavni/pomoćni serveri." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Potrebno zbog pomoćnih servera za replikaciju." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Dozvoljava čitanje podataka." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Daje pristup kompletnoj listi baza." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Dozvoljava gašenje servera." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -4980,157 +4670,157 @@ msgstr "" "Neophodno za većinu administrativnih opcija kao što su podešavanje globalnih " "promenljivih ili prekidanje procesa ostalih korisnika." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "Dozvoljava kreiranje i brisanje ključeva." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Dozvoljava izmenu podataka." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Nema privilegija." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "nema" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Privilegije vezane za tabele" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Napomena: MySQL imena privilegija moraju da budu na engleskom " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Globalne privilegije" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Privilegije vezane za bazu" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administracija" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Ograničenja resursa" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Napomena: Postavljanje ovih opcija na 0 (nulu) uklanja limite." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Podatci o prijavi" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Nemoj da mijenjaš lozinku" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Korisnik nije nađen." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Korisnik %s već postoji!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Dodali ste novog korisnika." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Ažurirali ste privilegije za %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Zabranili ste privilegije za %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Lozinka za %s je uspješno promjenjena." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Brišem %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Ponovo učitavam privilegije" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Izabrani korisnici su uspješno obrisani." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Privilegije su uspešno ponovo učitane." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Promijeni privilegije" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Zabrani" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Pregled korisnika" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Omogući" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Bilo koji" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Dodaj novog korisnika" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Ukloni izabrane korisnike" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Obustavi sve aktivne privilegije korisnika i zatim ih obriši." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Odbaci baze koje se zovu isto kao korisnici." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5143,92 +4833,92 @@ msgstr "" "server koristi ako su izvršene ručne izmjene. U tom slučaju %sponovo " "učitajte privilegije%s pre nego što nastavite." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Izabrani korisnik nije pronađen u tabeli privilegija." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Privilegije vezane za kolone" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Dodaj privilegije na slijedećoj bazi" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Dodaj privilegije na slijedećoj tabeli" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Promeni informacije o prijavi / Kopiraj korisnika" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Napravi novog korisnika sa istim privilegijama i ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... sačuvaj stare." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... obriši stare iz tabela korisnika." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... obustavi sve privilegije starog korisnika i zatim ga obriši." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" " ... obriši starog iz tabele korisnika i zatim ponovo učitaj privilegije." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "nema" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "Provjeri privilegije za bazu "%s"." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Korisnici koji imaju pristup "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "globalno" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "Specifično za bazu" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "Džoker" @@ -7848,25 +7538,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Naziv" @@ -7918,13 +7608,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Nazad na prethodnu stranu" @@ -8004,7 +7687,7 @@ msgstr "(\"PRIMARY\" mora biti ime samo primarnog ključa!)" msgid "Add to index  %s column(s)" msgstr "Dodaj u ključ  %s kolona(e)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -8121,41 +7804,6 @@ msgstr "Proveri referencijalni integritet:" msgid "Show tables" msgstr "Prikaži tabele" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Zauzeće" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Zauzeće" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Efektivne" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Statistike reda" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Ime" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinamički" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Dužina reda" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Zauzeće" @@ -8189,7 +7837,6 @@ msgid "Row length" msgstr "Dužina reda" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "Veličina reda" @@ -8262,49 +7909,49 @@ msgstr "nema" msgid "Column %s has been dropped" msgstr "Tabela %s je odbačena" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Osnovni ključ je upravo dodan %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Ključ je upravo dodan %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Relacioni pogled" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Predloži strukturu tabele" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy msgid "Add column" msgstr "Dodaj novo polje" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Na kraju tabele" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Na početku tabele" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Poslije %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Napravi ključ na %s kolona" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8346,6 +7993,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8687,6 +8338,10 @@ msgstr "Promjeni ime tabele u " #~ msgid "Process list" #~ msgstr "Lista procesa" +#, fuzzy +#~ msgid "Reload privileges" +#~ msgstr "Globalne privilegije" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/ca.po b/po/ca.po old mode 100755 new mode 100644 index 451dfdba7..477a40dbb --- a/po/ca.po +++ b/po/ca.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:13+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: catalan \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Mostra tot" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Cerca" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Executa" @@ -113,7 +93,7 @@ msgstr "Fes servir aquest valor" msgid "Database %1$s has been created." msgstr "S'ha creat la base de dades %1$s." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Comentaris de la Base de Dades: " @@ -140,17 +120,10 @@ msgstr "Nom de les columnes" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Tipus" @@ -163,7 +136,7 @@ msgstr "Tipus" msgid "Null" msgstr "Nul" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -187,24 +160,18 @@ msgstr "Enllaços a" msgid "Comments" msgstr "Comentaris" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "No" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -213,15 +180,9 @@ msgstr "No" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -240,141 +201,133 @@ msgstr "Veure l'esquema de la base de dades" msgid "No tables found in database." msgstr "Base de dades sense taules." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Tria Tot" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Desmarca tot" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "El nom de la base de dades és buit!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Base de dades %s reanomenada a %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "La Base de dades %s s'ha copiat a %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Reanomena base de dades a" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Ordre" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "i llavors" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Còpia base de dades a" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Només l'estructura" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Estructura i dades" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Només dades" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "Inclou CREATE DATABASE abans de copiar" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Afegeix %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Afegeix valor AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Afegeix restriccions" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Canvia a la base de dades copiada" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "Repositori BLOB" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Estat" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Activat" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Desactiva" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Fet malbé" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair" msgctxt "BLOB repository" msgid "Repair" msgstr "Repara" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Desactivat" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Activa" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Ordenació" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -383,14 +336,14 @@ msgstr "" "Les característiques addicionals per treballar amb taules enllaçades s'han " "desactivat. Per saber perquè prem a %saquí%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Edita pàgines PDF" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -399,11 +352,7 @@ msgstr "Taula" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Fila" @@ -411,42 +360,30 @@ msgstr "Fila" msgid "Size" msgstr "Mida" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "en ús" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Creació" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Darrera actualització" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Darrera comprovació" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -507,11 +444,7 @@ msgstr "Sup" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "O" @@ -545,85 +478,85 @@ msgstr "Usa Taules" msgid "SQL query on database %s:" msgstr "Consulta SQL a la base de dades %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Executa consulta" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Accés denegat" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "al menys una d'aquestes paraules" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "Totes les paraules" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "La frase exacta" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "com a expressió regular" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Resultats de la recerca per a \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s resultat(s) a la taula %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Navega" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Esborra" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Total: %s resultat(s)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Cerca a la base de dades" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Paraula(es) o valor(s) a cercar (comodí: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Trobat:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Paraules separades per un espai (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "A la(les) taula(es):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -631,36 +564,36 @@ msgstr "Camp interior:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Insereix" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Estructura" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Elimina" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Buida" @@ -670,25 +603,25 @@ msgstr "Buida" msgid "Table %s has been emptied" msgstr "S'ha buidat la taula %s" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Vista %s esborrada" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "S'ha esborrat la taula %s" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "El seguiment està actiu." -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "El seguiment no està actiu." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -696,92 +629,86 @@ msgid "" msgstr "" "Aquesta vista té al menys aques nombre de files. Consulta %sdocumentation%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Vista" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replicació" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Suma" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s és el motor d'emmagatzematge per defecte en aquest servidor MySQL." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Amb marca:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Marcar-ho tot" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Desmarcar tot" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Comprova taules desfragmentades" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Imprimeix vista" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Verifica la taula" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimitza la taula" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Repara la taula" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analitza la taula" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Exporta" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Diccionari de Dades" @@ -792,10 +719,10 @@ msgstr "Taules seguides" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -815,8 +742,8 @@ msgstr "Actualitzat" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Acció" @@ -850,8 +777,8 @@ msgstr "Instantània de l'estructura" msgid "Untracked tables" msgstr "Taules no seguides" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "Segueix taula" @@ -934,7 +861,7 @@ msgstr "S'ha esborrat la consulta desada." msgid "Showing bookmark" msgstr "Mostrant consultes desades" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "%s creat com a consulta desada" @@ -1021,296 +948,187 @@ msgstr "El nom del servidor és buit!" msgid "The user name is empty!" msgstr "El nom d'usuari és buit!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "La contrasenya és buida!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Les contrasenyes no coincideixen!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Afegeix un usuari nou" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create version" -msgid "Create User" -msgstr "Crea versió" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Recarrega els permisos" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Treu els usuaris triats" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "Tanca" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Cancel.lar" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Carregar" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Processos" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "Correcte" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Reanomena base de dades a" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Base de dades" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Còpia base de dades a" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Joc de Caràcters" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "La taula ha de tenir al menys un camp." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Crea una taula" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Cerca" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Les modificacions han estat desades" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Relació esborrada" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "Afegida relació de FOREIGN KEY" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Afegida relació interna" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Error: La relació no s'ha afegit." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Error: La relació ja existeix." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Error desant coordenades per al Dissenyador." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Característiques generals de relacions" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Desactivat" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Tria la clau referenciada" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Tria una clau externa" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Tria la clau principal o una clau única" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Tria el camp a mostrar" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "Donate" msgid "Done" msgstr "Donacions" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Anterior" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Següent" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Total" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr " Binari " -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Mar" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Abr" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Mai" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Jun" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Jul" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Ago" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Oct" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Gen" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Feb" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Abr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1318,178 +1136,178 @@ msgid "May" msgstr "Mai" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Jun" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Jul" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Ago" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Set" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Oct" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Nov" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Dec" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Diu" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Dll" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Dma" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Div" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Diu" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Dll" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Dma" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Dcr" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Dij" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Div" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Dis" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Diu" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Dll" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Dma" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Dcr" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Dij" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Div" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Dis" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "Wiki" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "en ús" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1549,7 +1367,7 @@ msgstr "Indexos" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Única" @@ -1567,7 +1385,7 @@ msgid "Comment" msgstr "Comentari" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1592,8 +1410,8 @@ msgstr "" "Els indexs %1$s i %2$s semblen iguals i un d'ells possiblement es podria " "esborrar." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Bases de dades" @@ -1766,11 +1584,7 @@ msgstr "Contrasenya:" msgid "Server Choice" msgstr "Elecció de Servidor" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "" "A partir d'aquest punt és necessari tenir les galetes (cookies) activades." @@ -1853,11 +1667,7 @@ msgstr "" "No es pot utilitzar iconv ni libiconv ni la funció recode_string mentre es " "carrega l'extensió d'informes. Comprova la configuració de php." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Si rebs una pàgina " "en blanc, tot està bé." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "No es pot carregar la configuració per defecte des de: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1895,49 +1697,29 @@ msgstr "" "La directiva $cfg['PmaAbsoluteUri'] HA d'estar a l'arxiu de " "configuració!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Index de servidor invàlid: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" "Nom de host invàlid pel servidor %1$s. Si us plau, reviseu la configuració." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Servidor" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Mètode d'identificació incorrecte establert a la configuració:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Mètode d'identificació incorrecte establert a la configuració:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Es necessari actualitzar a %s %s o posterior." @@ -1965,7 +1747,7 @@ msgstr "Enviat" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Documentació" @@ -1979,138 +1761,138 @@ msgstr "crida SQL" msgid "MySQL said: " msgstr "MySQL diu: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Explica SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Salta l'explicació de l'SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "Sense codi PHP" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Crea codi PHP" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Refresca" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Salta la Validació de l'SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Valida l'SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Motors" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Perfils" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Temps" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Bytes" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "." #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d-%m-%Y a les %H:%M:%S" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s dies, %s hores, %s minuts i %s segons" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Inici" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Anterior" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Final" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Vés a la Base de Dades "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "La funcionalitat %s es veu afectada per un error conegut, veieu %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2129,7 +1911,7 @@ msgid "Events" msgstr "Esdeveniments" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Nom" @@ -2157,15 +1939,15 @@ msgstr "Consulta segons exemple" msgid "Designer" msgstr "Dissenyador" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Importa" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Permisos" @@ -2184,11 +1966,7 @@ msgid "" msgstr "Pot ser aproximat. Veieu PFC (FAQ) 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Defragmentat" @@ -2207,7 +1985,7 @@ msgstr "El servidor no respon" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(o el sòcol del servidor local MySQL no està configurat correctament)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Detalls..." @@ -2217,36 +1995,22 @@ msgid "Change password" msgstr "Canvi de contrasenya" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Sense contrasenya" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Contrasenya" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Reescriu" @@ -2261,20 +2025,12 @@ msgid "MySQL 4.0 compatible" msgstr "Compatible amb MySQL 4.0" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Genera una Contrasenya" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Genera" @@ -2287,17 +2043,23 @@ msgstr "Crea una nova base de dades" msgid "Create" msgstr "Crea" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Sense permisos" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "La taula ha de tenir al menys un camp." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Crear una taula nova a la base de dades %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2363,11 +2125,7 @@ msgid "remember template" msgstr "Recordar plantilla" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Joc de caràcters de l'arxiu:" @@ -2378,7 +2136,7 @@ msgstr "Compresió" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Res" @@ -2425,11 +2183,7 @@ msgstr "" msgid "File to import" msgstr "Arxiu a importar" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Ubicació de l'arxiu de text" @@ -2437,20 +2191,12 @@ msgstr "Ubicació de l'arxiu de text" msgid "File uploads are not allowed on this server." msgstr "No es permet pujar arxius en aquest servidor." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "No està disponible el directori indicat per pujar arxius" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "Directori de pujada d'arxius del servidor web" @@ -2587,11 +2333,7 @@ msgstr "Classifica per la clau" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Opcions" @@ -2661,14 +2403,14 @@ msgstr "Mostrant registres: " msgid "total" msgstr "total" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "La consulta tarda %01.4f seg" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Canvi" @@ -2739,11 +2481,7 @@ msgstr "Ús del grup de memòries intermitges" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Total" @@ -3032,11 +2770,7 @@ msgstr "" "donarà el pròxim número més alt." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Format" @@ -3110,13 +2844,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Dades" @@ -3165,15 +2894,9 @@ msgstr "Tipus MIME" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Servidor" @@ -3368,7 +3091,7 @@ msgstr "Exporta contingut" msgid "Open new phpMyAdmin window" msgstr "Obrir nova finestra de phpMyAdmin" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "No hi ha taules" @@ -3381,7 +3104,7 @@ msgstr "Resultat SQL" msgid "Generated by" msgstr "Generat per" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL ha retornat un conjunt buit (p.e. cap fila)." @@ -3533,20 +3256,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Principal" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Índex" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Text sencer" @@ -3771,6 +3494,10 @@ msgstr "Aquest format no té opcions" msgid "not OK" msgstr "Incorrecte" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "Correcte" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Activat" @@ -3794,7 +3521,7 @@ msgstr "" "Mira a la documentació cóm actualitzar la teva Taula de Comentaris de les " "Columnes" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Consulta SQL desada" @@ -3847,13 +3574,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Nom d'usuari" @@ -3870,22 +3592,14 @@ msgstr "Estat del mestre" msgid "Slave status" msgstr "Estat de l'esclau" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Variable" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Valor" @@ -3905,40 +3619,11 @@ msgstr "" msgid "Add slave replication user" msgstr "Afegeix l'usuari esclau de replicació" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Qualsevol usuari" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Usa camp de text" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Qualsevol servidor" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Local" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Aquest Host" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Utilitza la Taula de Hosts" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3962,7 +3647,6 @@ msgid "Use Host Table" msgstr "Utilitza la Taula de Hosts" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3998,29 +3682,29 @@ msgstr "Idioma desconegut: %1$s." msgid "Servers" msgstr "Servidors" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Variables" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Jocs de caràcters" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Motors" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Registre binari" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Processos" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Sincronitza" @@ -4047,51 +3731,51 @@ msgstr "Diferència" msgid "Target database" msgstr "Base de dades destinació" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Executar consulta/es SQL al servidor %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Executa consulta/s SQL a la Base de Dades %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Nom de les columnes" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Desa aquesta consulta SQL" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Deixa accedir a cada usuari a aquesta consulta desada" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Reemplaça una consulta desada ja existent amb el mateix nom" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "No sobreescriure aquesta consulta des de fora de la finestra" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Separador" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Mostra aquesta consulta de nou " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Envia" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Només mirar" @@ -4270,13 +3954,13 @@ msgstr "Definicio de PARTICIÓ" msgid "Save" msgstr "Desa" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add column(s)" msgid "Add %s column(s)" msgstr "Afegeix columna(es)" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4488,8 +4172,8 @@ msgstr "Reinicia" msgid "Protocol version" msgstr "Versió del protocol" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Usuari" @@ -4952,114 +4636,114 @@ msgstr "Motors d'emmagatzematge" msgid "View dump (schema) of databases" msgstr "Veure volcat (esquema) de les bases de dades" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Inclou tots els permisos excepte GRANT (atorgar)." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Permet alterar l'estructura de taules existents." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Permet alterar i esborrar rutines enmagatzemades." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Permet crear noves bases de dades i taules." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Permet crear rutines enmgatzemades." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Permet crear noves taules." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Permet crear taules temporals." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Permet crear, esborrar i reanomenar comptes d'usuari." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Permet crear noves vistes." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Permet esborrar dades." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Permet eliminar bases de dades i taules." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Permet eliminar taules." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Permet establir events per al planificador d'events" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Permet executar rutines enmagatzemades." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Permet importar i exportar dades amb arxius externs." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Permet afegir usuaris i permisos sense tenir que recarregar les taules de " "permisos." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Permet crear i eliminar indexs." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Permet inserir i modificar dades." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Permet bloquejar taules per l'actual fil d'execució." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Limita el numero de noves connexions que pot obrir l'usuari per hora." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Limita el numero de consultes que pot enviar l'usuari al servidor per hora." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5067,61 +4751,61 @@ msgstr "" "Limita el numero d'ordres que pot executar l'usuari canviant qualsevol taula " "o base de dades per hora." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Límita el nombre de connexions simultànies que l'usuari pot tenir." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Permet veure processos de tots els usuaris" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "No té efecte en aquesta versió de MySQL." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Permet recarregar les configuracions del servidor i buidar les seves " "memòries cau." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" "Dona el dret a l'usuari de preguntar quins servidors mestres / esclaus hi ha." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Es necessari per a la replicació en servidors esclaus." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Permet llegir dades." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Dona accés a la llista completa de bases de dades." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Permet fer consultes de tipus SHOW CREATE VIEW." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Permet parar el servidor." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5131,157 +4815,157 @@ msgstr "" "permés; Es necessari per moltes operacions d'administració com ara establir " "variables globals o bé cancel.lar fils d'execució d'altres usuaris." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Permet crear i eliminar disparadors (triggers)" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Permet canviar dades." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Sense permisos." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Res" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Permisos especifics de taula" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Nota: Els noms dels privilegis del MySQL són en idioma anglès " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Permisos generals" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Permisos especifics de Base de dades" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administració" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Limit de recursos" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Nota: Es treu el limit establint aquestes opcions a 0 (zero)." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Informació d'Identificació" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "No canviïs la contrasenya" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "No s'han trobat usuaris." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "L'usuari %s ja existeix!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Has afegit un usuari nou." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Heu actualitzat els permisos de %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Has tret els permisos per %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "La contrasenya per %s s'ha canviat correctament." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Esborrant %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "No s\\han triat usuaris per esborrar!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Recarregant permisos" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "S'han esborrat correctament els usuaris triats." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Els permisos s'han recarregat correctament." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Edita permisos" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Treu" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Informació general de l'usuari" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Atorga" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Qualsevol" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Afegeix un usuari nou" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Treu els usuaris triats" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Treu tots els permisos actius dels usuaris i els esborra després." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "" "Esborra les bases de dades que tenen els mateixos noms que els usuaris." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5294,49 +4978,49 @@ msgstr "" "permisos que utilitza el servidor si s'han fet canvis manualment. En aquest " "cas, es necessari %srecarregar els permisos%s abans de continuar." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "No s'ha trobat l'usuari triat a la taula de permisos." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Permisos específics de columna" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Afegeix permisos a la següent base de dades" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Els comodins _ i % han de marcar-se amb una \\ per usar-los literalment" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Afegeix permisos a la següent taula" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Canvi d'Informació de Connexió / Copia d'Usuari" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Crea un nou usuari amb els mateixos permisos i ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... respecta l'antic." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... esborra l'antic de les taules d'usuaris." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... treu tots els permisos actius de l'antic i esborra'l després." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5344,44 +5028,44 @@ msgstr "" " ... esborra l'antic de les taules d'usuaris i recarrega els permisos " "després." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Base de dades per usuari" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Res" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Crea una base de dades amb el mateix nom i atorga tots els permisos" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Atorga tots els permisos en un nom comodí (nomusuari_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "Atorga tots els permisos a la base de dades "%s"" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Usuaris amb accés a "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "global" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "específic de la base de dades" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "comodins" @@ -8356,25 +8040,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "Id de la fila inserida: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Mostrant com a codi PHP" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Mostrant consulta SQL" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Problemes amb els indexs de la taula `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Etiqueta" @@ -8427,13 +8111,6 @@ msgstr "" msgid "Show insert query" msgstr "Mostrant consulta SQL" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "i llavors" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Torna" @@ -8516,7 +8193,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Afegeix a l'índex %s columna(es)  " -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "El comptador de columnes ha de ser més gran que zero." @@ -8630,41 +8307,6 @@ msgstr "Comprova la integritat referencial:" msgid "Show tables" msgstr "Mostra taules" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Utilització d'espai" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Ús" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Efectiu" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Estadística de files" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Sentències" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "estàtic" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinàmic" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Tamany de fila" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Utilització d'espai" @@ -8698,7 +8340,6 @@ msgid "Row length" msgstr "Tamany de fila" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "Mida de fila " @@ -8775,50 +8416,50 @@ msgstr "Res" msgid "Column %s has been dropped" msgstr "S'ha esborrat la taula %s" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "S'ha afegit una clau principal a %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "S'ha afegit un índex a %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Vista de Relacions" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Proposa una estructura de taula" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add column(s)" msgid "Add column" msgstr "Afegeix columna(es)" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Al final de la taula" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Al principi de la taula" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Darrere de %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Crea un índex de columnes %s: " -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "particionat" @@ -8862,6 +8503,10 @@ msgstr "Comenta aquestes dues línies si no les necessites." msgid "SQL statements exported. Please copy the dump or execute it." msgstr "Declaracions SQL exportades. Copia el bolcat o executa'l." +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "Tanca" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -9309,6 +8954,9 @@ msgstr "Reanomena les taules a" #~ msgid "Process list" #~ msgstr "Llista de processos" +#~ msgid "Reload privileges" +#~ msgstr "Recarrega els permisos" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/cs.po b/po/cs.po old mode 100755 new mode 100644 index b07bdc4fe..1f46b7e1f --- a/po/cs.po +++ b/po/cs.po @@ -5,11 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-06-08 10:43+0200\n" "Last-Translator: Michal \n" "Language-Team: czech \n" @@ -21,11 +17,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Zobrazit vše" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -44,53 +40,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Vyhledávání" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Proveď" @@ -116,7 +96,7 @@ msgstr "Použít tuto hodnotu" msgid "Database %1$s has been created." msgstr "Byla vytvořena databáze %1$s." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Komentář k databázi: " @@ -141,17 +121,10 @@ msgstr "Pole" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Typ" @@ -164,7 +137,7 @@ msgstr "Typ" msgid "Null" msgstr "Nulový" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -188,24 +161,18 @@ msgstr "Odkazuje na" msgid "Comments" msgstr "Komentáře" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Ne" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -214,15 +181,9 @@ msgstr "Ne" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -241,135 +202,127 @@ msgstr "Export databáze" msgid "No tables found in database." msgstr "V databázi nebyla nalezena žádná tabulka." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Vybrat vše" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Odznačit vše" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Jméno databáze je prázdné!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Databáze %s byla přejmenována na %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Databáze %s byla zkopírována na %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Přejmenovat databázi na" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Příkaz" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "a poté" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Zkopírovat databázi na" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Pouze strukturu" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Strukturu a data" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Jen data" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "Vytvořit databázi před kopírováním (CREATE DATABASE)" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Přidat %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Přidat hodnotu AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Přidat integritní omezení" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Přepnout na zkopírovanou databázi" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "Skladiště BLOBů" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Stav" -#: db_operations.php:559 +#: db_operations.php:548 msgctxt "BLOB repository" msgid "Enabled" msgstr "Zapnuté" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Vypnout" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Poškozené" -#: db_operations.php:577 +#: db_operations.php:566 msgctxt "BLOB repository" msgid "Repair" msgstr "Opravit" -#: db_operations.php:585 +#: db_operations.php:574 msgctxt "BLOB repository" msgid "Disabled" msgstr "Vypnuté" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Zapnout" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Porovnávání" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -378,14 +331,14 @@ msgstr "" "Některé z rozšířených funkcí phpMyAdmina nelze používat. %sZde%s zjistíte " "proč." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Upravit PDF stránky" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -394,11 +347,7 @@ msgstr "Tabulka" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Řádků" @@ -406,42 +355,30 @@ msgstr "Řádků" msgid "Size" msgstr "Velikost" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "právě se používá" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Vytvoření" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Poslední změna" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Poslední kontrola" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, php-format msgid "%s table" msgid_plural "%s tables" @@ -502,11 +439,7 @@ msgstr "smazat" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "nebo" @@ -536,120 +469,120 @@ msgstr "Použít tabulky" msgid "SQL query on database %s:" msgstr "SQL dotaz na databázi %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Provést dotaz" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Přístup odepřen" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "alespoň jedno ze slov" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "všechna slova" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "přesnou frázi" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "jako regulární výraz" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Výsledky vyhledávání pro „%s“ %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s odpovídající(ch) záznam(ů) v tabulce %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Projít" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Odstranit" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Celkem: %s odpovídající(ch) záznam(ů)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Vyhledávání v databázi" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Slova nebo hodnoty, které chcete vyhledat (zástupný znak: „%“):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Najít:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Slova jsou oddělena mezerou („ “)." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "V tabulkách:" -#: db_search.php:367 +#: db_search.php:355 msgid "Inside column:" msgstr "Uvnitř pole:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Vložit" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Struktura" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Odstranit" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Vyprázdnit" @@ -659,25 +592,25 @@ msgstr "Vyprázdnit" msgid "Table %s has been emptied" msgstr "Tabulka %s byla vyprázdněna" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Pohled %s byl odstraněn" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Tabulka %s byla odstraněna" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "Sledování je zapnuté." -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "Sledování není zapnuté." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -685,92 +618,86 @@ msgid "" msgstr "" "Tento pohled má alespoň tolik řádek. Podrobnosti naleznete v %sdokumentaci%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Pohled" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replikace" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Celkem" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s je výchozí úložiště na tomto MySQL serveru." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Zaškrtnuté:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Zaškrtnout vše" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Odškrtnout vše" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Zaškrtnout neoptimální" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Náhled pro tisk" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Zkontrolovat tabulku" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimalizovat tabulku" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Opravit tabulku" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analyzovat tabulku" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Export" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Datový slovník" @@ -781,10 +708,10 @@ msgstr "Sledované tabulky" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -804,8 +731,8 @@ msgstr "Aktualizováno" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Akce" @@ -839,8 +766,8 @@ msgstr "Snímek struktury" msgid "Untracked tables" msgstr "Nesledované tabulky" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "Sledovat tabulku" @@ -923,7 +850,7 @@ msgstr "Položka byla smazána z oblíbených." msgid "Showing bookmark" msgstr "Zobrazuji oblíbený dotaz" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Vytvořen oblíbený dotaz %s" @@ -1007,425 +934,316 @@ msgstr "Jméno počítače je prázdné!" msgid "The user name is empty!" msgstr "Jméno uživatele je prázdné!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Heslo je prázdné!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Hesla nejsou stejná!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Přidat nového uživatele" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create version" -msgid "Create User" -msgstr "Vytvořit verzi" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reloading the privileges" -msgid "Reloading Privileges" -msgstr "Načítám oprávnění" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Odstranit vybrané uživatele" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "Ukončit" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Zrušit" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Nahrát" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Procesy" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Přejmenovat databázi na" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Databáze" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Zkopírovat databázi na" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Znaková sada" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one column." -msgid "Table must have atleast 1 column" -msgstr "Tabulka musí mít alespoň jedno pole." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Vytvořit tabulku" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Vyhledávání" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Změny byly uloženy" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Relace smazána" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "Relace FOREIGN KEY byla vytvořena" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Interní relace vytvořena" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Chyba: relace nebyla přidána." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Chyba: relace již existuje." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Chyba při ukládání souřadnic pro Návrháře." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Obecné funkce relací" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Vypnuto" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Zvolte odkazovaný klíč" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Zvolte cizí klíč" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Zvolte, prosím, primární nebo unikátní klíč" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 msgid "Choose column to display" msgstr "Zvolte která pole zobrazit" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 msgid "Done" msgstr "Hotovo" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 msgid "Prev" msgstr "Předchozí" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Další" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 msgid "Today" msgstr "Dnešek" -#: js/messages.php:111 +#: js/messages.php:82 msgid "January" msgstr "leden" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "únor" -#: js/messages.php:113 +#: js/messages.php:84 msgid "March" msgstr "březen" -#: js/messages.php:114 +#: js/messages.php:85 msgid "April" msgstr "duben" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "květen" -#: js/messages.php:116 +#: js/messages.php:87 msgid "June" msgstr "červen" -#: js/messages.php:117 +#: js/messages.php:88 msgid "July" msgstr "červenec" -#: js/messages.php:118 +#: js/messages.php:89 msgid "August" msgstr "srpen" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "září" -#: js/messages.php:120 +#: js/messages.php:91 msgid "October" msgstr "říjen" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "listopad" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "prosinec" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "led" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "úno" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "bře" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "dub" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 msgctxt "Short month name" msgid "May" msgstr "kvě" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "čen" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "čec" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "srp" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "zář" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "říj" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "lis" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "pro" -#: js/messages.php:151 +#: js/messages.php:122 msgid "Sunday" msgstr "Neděle" -#: js/messages.php:152 +#: js/messages.php:123 msgid "Monday" msgstr "Pondělí" -#: js/messages.php:153 +#: js/messages.php:124 msgid "Tuesday" msgstr "Úterý" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "Středa" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "Čtvrtek" -#: js/messages.php:156 +#: js/messages.php:127 msgid "Friday" msgstr "Pátek" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "Sobota" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Ned" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Pon" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Úte" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Stř" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Čtv" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Pát" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sob" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 msgid "Su" msgstr "Ne" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 msgid "Mo" msgstr "Po" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 msgid "Tu" msgstr "Út" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 msgid "We" msgstr "St" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 msgid "Th" msgstr "Čt" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 msgid "Fr" msgstr "Pá" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 msgid "Sa" msgstr "So" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "Týd" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "Hodiny" -#: js/messages.php:194 +#: js/messages.php:165 msgid "Minute" msgstr "Minuty" -#: js/messages.php:195 +#: js/messages.php:166 msgid "Second" msgstr "Sekundy" @@ -1485,7 +1303,7 @@ msgstr "Indexy" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unikátní" @@ -1503,7 +1321,7 @@ msgid "Comment" msgstr "Komentář" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1528,8 +1346,8 @@ msgstr "" "Indexy %1$s a %2$s vypadají stejné a jeden z nich by pravděpodobně mohl být " "odstraněn." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Databáze" @@ -1700,11 +1518,7 @@ msgstr "Heslo:" msgid "Server Choice" msgstr "Server" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Přihlášení vyžaduje povolené cookies." @@ -1786,11 +1600,7 @@ msgstr "" "Nelze použít funkce iconv ani libiconv ani recode_string, přestože rozšíření " "jsou nahrána. Zkontrolujte nastavení PHP." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Pokud získáte prázdnou " "stránku, všechno je v pořádku." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "Nepodařilo se nahrát výchozí konfiguraci ze souboru: %1$s" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1827,47 +1629,27 @@ msgstr "" "Parametr $cfg['PmaAbsoluteUri'] MUSÍ být nastaven v konfiguračním " "souboru!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "Chybný index serveru: „%s“" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "Chybné jméno serveru pro server %1$s. Prosím zkontrolujte nastavení." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Server" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "V konfiguraci máte špatnou autentizační metodu:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "V konfiguraci máte špatnou autentizační metodu:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Měli byste aktualizovat %s na verzi %s nebo vyšší." @@ -1893,7 +1675,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentace" @@ -1907,136 +1689,136 @@ msgstr "SQL-dotaz" msgid "MySQL said: " msgstr "MySQL hlásí: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Vysvětlit SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Bez vysvětlení (EXPLAIN) SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "Bez PHP kódu" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Vytvořit PHP kód" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Obnovit" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Bez kontroly SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Zkontrolovat SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "Upravit tento dotaz na této stránce" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "Upravit zde" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Profilování" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Čas" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "B" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EiB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr " " #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%a %d. %b %Y, %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s dnů, %s hodin, %s minut a %s sekund" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Začátek" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Předchozí" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Konec" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Přejít na databázi „%s“." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "Funkčnost %s je omezena známou chybou, viz %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2057,7 +1839,7 @@ msgid "Events" msgstr "Události" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Název" @@ -2085,15 +1867,15 @@ msgstr "Dotaz" msgid "Designer" msgstr "Návrhář" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Import" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Oprávnění" @@ -2114,11 +1896,7 @@ msgstr "" "FAQ 3.11[/a]" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Navíc" @@ -2136,7 +1914,7 @@ msgstr "Server neodpovídá" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(nebo není správně nastaven lokální socket MySQL serveru)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Podrobnosti..." @@ -2146,36 +1924,22 @@ msgid "Change password" msgstr "Změnit heslo" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Žádné heslo" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Heslo" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Heslo znovu" @@ -2188,20 +1952,12 @@ msgid "MySQL 4.0 compatible" msgstr "Kompatibilní s MySQL 4.0" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Vytvořit heslo" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Vytvořit" @@ -2214,17 +1970,21 @@ msgstr "Vytvořit novou databázi" msgid "Create" msgstr "Vytvořit" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Nemáte oprávnění" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +msgid "Table must have at least one column." +msgstr "Tabulka musí mít alespoň jedno pole." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Vytvořit novou tabulku v databázi %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 msgid "Number of columns" msgstr "Počet polí" @@ -2287,11 +2047,7 @@ msgid "remember template" msgstr "zapamatovat si hodnotu" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Znaková sada souboru:" @@ -2302,7 +2058,7 @@ msgstr "Komprese" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Žádná" @@ -2349,11 +2105,7 @@ msgstr "" msgid "File to import" msgstr "Soubor pro importování" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "textový soubor" @@ -2361,20 +2113,12 @@ msgstr "textový soubor" msgid "File uploads are not allowed on this server." msgstr "Upload souborů není na tomto serveru povolen." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Adresář určený pro upload souborů nemohl být otevřen" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "soubor z adresáře pro upload" @@ -2508,11 +2252,7 @@ msgstr "Setřídit podle klíče" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Nastavení" @@ -2580,14 +2320,14 @@ msgstr "Zobrazeny záznamy" msgid "total" msgstr "celkem" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "dotaz trval %01.4f sekund" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Změnit" @@ -2655,11 +2395,7 @@ msgstr "Využití vyrovnávací paměti" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Celkem" @@ -2943,11 +2679,7 @@ msgstr "" "soubory vymazány. Jinak jsou soubory přejmenovány a označeny vyšším číslem." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Formát" @@ -3011,13 +2743,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Data" @@ -3066,15 +2793,9 @@ msgstr "MIME typ" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Počítač" @@ -3267,7 +2988,7 @@ msgstr "Exportovat obsah" msgid "Open new phpMyAdmin window" msgstr "Otevřít nové okno phpMyAdmina" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "Nová tabulka" @@ -3279,7 +3000,7 @@ msgstr "Výsledek SQL dotazu" msgid "Generated by" msgstr "Vygeneroval" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL vrátil prázdný výsledek (tj. nulový počet řádků)." @@ -3424,20 +3145,20 @@ msgstr "Převést na Kanu" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primární" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Index" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Fulltext" @@ -3662,6 +3383,10 @@ msgstr "Tento formát nemá žádná nastavení" msgid "not OK" msgstr "není v pořádku" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Zapnuto" @@ -3685,7 +3410,7 @@ msgstr "" "Podívejte se prosím do dokumentace, jak aktualizovat tabulku s informacemi " "o polích (tabulka column_comments)" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Oblíbený SQL dotaz" @@ -3743,13 +3468,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Jméno uživatele" @@ -3766,22 +3486,14 @@ msgstr "Stav nadřízeného" msgid "Slave status" msgstr "Stav podřízeného" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Proměnná" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Hodnota" @@ -3801,40 +3513,11 @@ msgstr "" msgid "Add slave replication user" msgstr "Přidat replikačního uživatele pro podřízený server" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Jakýkoliv uživatel" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Použít textové pole" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Jakýkoliv počítač" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Lokální" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Tento počítač" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Použít tabulku Host" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3858,7 +3541,6 @@ msgid "Use Host Table" msgstr "Použít tabulku Host" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3894,29 +3576,29 @@ msgstr "Neznámý jazyk: %1$s." msgid "Servers" msgstr "Servery" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Proměnné" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Znakové sady" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Úložiště" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Binární log" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Procesy" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Synchronizace" @@ -3943,49 +3625,49 @@ msgstr "Rozdíly" msgid "Target database" msgstr "Cílová databáze" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Spustit SQL dotaz(y) na serveru %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Spustit SQL dotaz(y) na databázi %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 msgid "Columns" msgstr "Pole" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Přidat tento SQL dotaz do oblíbených" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Umožnit všem uživatelům používat tuto položku" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Přepsat existující oblíbený dotaz stejného jména" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Nepřepisovat tento dotaz z hlavního okna" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Oddělovač" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Zobrazit zde tento dotaz znovu " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Provést" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Zobrazit" @@ -4154,12 +3836,12 @@ msgstr "Definice PARTITION" msgid "Save" msgstr "Uložit" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, php-format msgid "Add %s column(s)" msgstr "Přidat %s polí" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 msgid "You have to add at least one column." msgstr "Musíte přidat alespoň jedno pole." @@ -4328,8 +4010,8 @@ msgstr "Původní" msgid "Protocol version" msgstr "Verze protokolu" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Uživatel" @@ -4769,114 +4451,114 @@ msgstr "Úložiště" msgid "View dump (schema) of databases" msgstr "Export databází" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Všechna oprávnění kromě GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Umožňuje měnit strukturu existujících tabulek." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Umožňuje měnit a rušit uložené procedury." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Umožňuje vytvářet nové databáze a tabulky." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Umožňuje vytvářet uložené procedury." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Umožňuje vytvářet nové tabulky." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Umožňuje vytvářet dočasné tabulky." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Umožňuje vytvářet, rušit a přejmenovávat účty uživatelů." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Umožňuje vytvářet nové pohledy." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Umožňuje mazat data." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Umožňuje odstranit databáze a tabulky." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Umožňuje odstranit tabulky." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Umožňuje plánovat úlohy pomocí plánovače" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Umožňuje spouštět uložené procedury." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Umožňuje importovat a exportovat data z/do souborů na serveru." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Umožňuje přidávat uživatele a oprávnění bez znovunačítání tabulek " "s oprávněními." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Umožňuje vytvářet a rušit indexy." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Umožňuje vkládat a přepisovat data." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Umožňuje zamknout tabulku pro aktuální vlákno." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Omezuje počet nových připojení, která může uživatel vytvořit za hodinu." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Omezuje, kolik dotazů může uživatel odeslat serveru za hodinu." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4884,60 +4566,60 @@ msgstr "" "Omezuje, kolik dotazů měnících nějakou tabulku nebo databázi může uživatel " "spustit za hodinu." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Omezuje počet současných připojení uživatele." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Umožňuje prohlížet procesy všech uživatelů" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Nemá žádný vliv v této verzi MySQL." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Umožňuje znovu načíst nastavení a vyprázdnění vyrovnávacích pamětí MySQL " "serveru." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Umožní uživateli zjistit, kde je hlavní / pomocný server." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Potřebné pro replikaci pomocných serverů." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Umožňuje vybírat data." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Umožňuje přístup k úplnému seznamu databází." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Umožňuje spuštění dotazu SHOW CREATE VIEW." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Umožňuje vypnout server." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -4947,152 +4629,152 @@ msgstr "" "pro většinu operací pro správu serveru jako nastavování globálních " "proměnných a zabíjení vláken jiných uživatelů." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Umožňuje vytváření a mazání spouští" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Umožňuje měnit data." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Žádná oprávnění." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 msgctxt "None privileges" msgid "None" msgstr "Žádná" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Oprávnění pro jednotlivé tabulky" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Poznámka: názvy oprávnění v MySQL jsou uváděny anglicky " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Globální oprávnění" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Oprávnění pro jednotlivé databáze" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Správa" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Omezení zdrojů" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Poznámka: Nastavení těchto parametrů na 0 (nulu) odstraní omezení." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Přihlašování" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Neměnit heslo" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 msgid "No user found." msgstr "Nebyl nalezen žádný uživatel." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Uživatel %s již existuje!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Uživatel byl přidán." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Byla aktualizována oprávnění pro %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Byla zrušena práva pro %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Heslo pro %s bylo úspěšně změněno." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Odstraňuji %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Musíte vybrat uživatele, které chcete odstranit!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Načítám oprávnění" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Vybraní uživatelé byli úspěšně odstraněni." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Oprávnění byla načtena úspěšně." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Upravit oprávnění" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Zrušit" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Přehled uživatelů" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Přidělování" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Jakýkoliv" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Přidat nového uživatele" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Odstranit vybrané uživatele" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Odebrat uživatelům veškerá oprávnění a poté je odstranit z tabulek." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Odstranit databáze se stejnými jmény jako uživatelé." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5105,91 +4787,91 @@ msgstr "" "tyto tabulky upravovány. V tomto případě je vhodné provést %snové načtení " "oprávnění%s před pokračováním." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Zvolený uživatel nebyl nalezen v tabulce oprávnění." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Oprávnění pro jednotlivá pole" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Přidat oprávnění pro databázi" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Zástupné znaky _ a % by měly být escapovány pomocí \\ pokud je chcete použít " "jako znak" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Přidat oprávnění pro tabulku" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Změnit informace o uživateli / Kopírovat uživatele" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Vytvořit nového uživatele se stejnými oprávněními a ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... zachovat původního uživatele." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... smazat původního uživatele ze všech tabulek." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... odebrat všechna oprávnění původnímu uživateli a poté ho smazat." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr " ... smazat uživatele a poté znovu načíst oprávnění." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Databáze pro uživatele" -#: server_privileges.php:2060 +#: server_privileges.php:2037 msgctxt "Create none database for user" msgid "None" msgstr "Žádná" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Vytvořit databázi stejného jména a přidělit všechna oprávnění" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Přidělit všechna oprávnění na jméno odpovídající masce (uživatel\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "Přidělit všechna oprávnění na databázi "%s"" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Uživatelé mající přístup k „%s“" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "globální" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "závislé na databázi" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "maska" @@ -8069,25 +7751,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "ID vloženého řádku: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Zobrazuji jako PHP kód" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Zobrazuji SQL dotaz" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Problémy s indexy v tabulce `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Název" @@ -8137,13 +7819,6 @@ msgstr "Vložit jako nový řádek a ignorovat chyby" msgid "Show insert query" msgstr "Zobrazit dotaz pro vložení" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "a poté" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Návrat na předchozí stránku" @@ -8224,7 +7899,7 @@ msgstr "(„PRIMARY“ musí být jméno pouze primárního klíč msgid "Add to index  %s column(s)" msgstr "Přidat %s polí do indexu" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Počet polí musí být větší než nula." @@ -8336,41 +8011,6 @@ msgstr "Zkontrolovat integritu odkazů:" msgid "Show tables" msgstr "Zobrazit tabulky" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Využití místa" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Používá" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Efektivní" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Statistika řádků" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Údaj" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "statický" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dynamický" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Délka řádku" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Využití místa" @@ -8404,7 +8044,6 @@ msgid "Row length" msgstr "Délka řádku" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Velikost řádku " @@ -8470,47 +8109,47 @@ msgstr "Žádná" msgid "Column %s has been dropped" msgstr "Pole %s byla odstraněno" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "V tabulce %s byl vytvořen primární klíč" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Na poli %s byl vytvořen index" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Zobrazit relace" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Navrhnout strukturu tabulky" -#: tbl_structure.php:538 +#: tbl_structure.php:540 msgid "Add column" msgstr "Přidat sloupec" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Na konci tabulky" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Na začátku tabulky" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Po %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, php-format msgid "Create an index on  %s columns" msgstr "Vytvořit index na  %s polích" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "používá oddíly" @@ -8555,6 +8194,10 @@ msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" "SQL příkazy byly exportovány. Prosím zkopírujte si je, nebo je spusťte." +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "Ukončit" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/cy.po b/po/cy.po index 6a5b2f02f..c4b9523a3 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,11 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-06-07 20:23+0200\n" "Last-Translator: \n" "Language-Team: Welsh \n" @@ -22,11 +18,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Dangos pob" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -45,53 +41,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Chwilio" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Ewch" @@ -117,7 +97,7 @@ msgstr "Defnyddiwch y gwerth hwn" msgid "Database %1$s has been created." msgstr "Cafodd y gronfa ddata %1$s ei chreu." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Sylw cronfa ddata:" @@ -142,17 +122,10 @@ msgstr "Colofn" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Math" @@ -165,7 +138,7 @@ msgstr "Math" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -189,24 +162,18 @@ msgstr "Cysylltu i" msgid "Comments" msgstr "Sylwadau" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Na" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -215,15 +182,9 @@ msgstr "Na" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -242,135 +203,127 @@ msgstr "Dangos dadlwythiad (sgema) y gronfa ddata" msgid "No tables found in database." msgstr "Dim tablau wedi'u darganfod yn y gronfa ddata." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Dewis Pob" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Dad-ddewis Pob" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Mae enw'r gronfa ddata'n wag!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Cafodd cronfa ddata %s ei hailenwi i %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Cafodd y gronfa ddata %s ei chopïo i %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Ailenwch y gronfa ddata i" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Gorchymyn" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "ac yna" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Copïwch y gronfa ddata i" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Strwythur yn unig" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Strwythur a data" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Data yn unig" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "Defnyddiwch CREATE DATABASE cyn copïo" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Ychwanegwch %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Ychwanegwch werth AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Ychwanegwch cyfyngiadau" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Newidiwch i'r gronfa ddata a gopïwyd" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "Ystorfa BLOB" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Statws" -#: db_operations.php:559 +#: db_operations.php:548 msgctxt "BLOB repository" msgid "Enabled" msgstr "Galluogwyd" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Analluogwch" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Wedi difrodi" -#: db_operations.php:577 +#: db_operations.php:566 msgctxt "BLOB repository" msgid "Repair" msgstr "Trwsiwch" -#: db_operations.php:585 +#: db_operations.php:574 msgctxt "BLOB repository" msgid "Disabled" msgstr "Analluogwyd" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Galluogwch" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Coladiad" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -379,14 +332,14 @@ msgstr "" "Mae'r nodweddion ar gyfer gweithio gyda thablau sydd wedi cysylltu wedi'u " "hanalluogi. Pwyswch %syma%s i ddarganfod pam." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Golygwch Dudalennau PDF" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -395,11 +348,7 @@ msgstr "Tabl" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Rhesi" @@ -407,42 +356,30 @@ msgstr "Rhesi" msgid "Size" msgstr "Maint" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "ar ddefnydd" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Cread" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Diweddariad diwethaf" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Gwiriad diwethaf" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, php-format msgid "%s table" msgid_plural "%s tables" @@ -502,11 +439,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Or" @@ -536,120 +469,120 @@ msgstr "Defnyddiwch Dablau" msgid "SQL query on database %s:" msgstr "Ymholiad SQL ar gronfa ddata %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Cyflwynwch yr Ymholiad" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Mynediad wedi'i wrthod" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "o leiaf un o'r geiriau" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "pob gair" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "y cymal union" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "fel mynegiad arferol (regular expression)" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Canlyniadau chwilio am \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s ergyd mewn tabl %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Porwch" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Dileu" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Cyfanswm: %s ergyd" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Chwiliwch yn y gronfa ddata" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Geiriau neu werthoedd i'w chwilio amdanyn nhw (nod-chwiliwr: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Darganfyddwch:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Caiff geiriau eu gwahanu gan nod bwlch (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Tu fewn tabl(au):" -#: db_search.php:367 +#: db_search.php:355 msgid "Inside column:" msgstr "Tu fewn colofn:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Mewnosod" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Strwythur" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Gollwng" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Gwagu" @@ -659,25 +592,25 @@ msgstr "Gwagu" msgid "Table %s has been emptied" msgstr "Cafodd tabl %s ei wagu" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Cafodd golwg %s ei ollwng" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Cafodd tabl %s ei ollwng" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "Mae tracio'n weithredol" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "Nid yw tracio'n weithredol" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -685,92 +618,86 @@ msgid "" msgstr "" "Mae gan yr olwg hon o leiaf y nifer hwn o resi. Gweler y %sdogfennaeth%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Dangos" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Dyblygiad" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Swm" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s yw'r peiriant storio diofyn ar y gweinydd MySQL hwn." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Gyda'r dewis:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Dewis Pob" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Dad-ddewis Pob" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Gwiriwch dablau â gorbenion" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Argraffu golwg" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Gwirio tabl" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimeiddio tabl" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Trwsio tabl" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Dadansoddi tabl" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Allforio" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Geiriadur Data" @@ -781,10 +708,10 @@ msgstr "Tablau a draciwyd" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -804,8 +731,8 @@ msgstr "Diweddarwyd" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Gweithred" @@ -839,8 +766,8 @@ msgstr "Ciplun strwythur" msgid "Untracked tables" msgstr "Tablau heb dracio " -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "Tracio tabl" @@ -923,7 +850,7 @@ msgstr "Cafodd y clustnod ei ddileu." msgid "Showing bookmark" msgstr "Dangos clustnod" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Clustnodi %s a grëwyd" @@ -1004,423 +931,316 @@ msgstr "Mae enw'r gwesteiwr yn wag!" msgid "The user name is empty!" msgstr "Mae enw'r defnyddiwr yn wag!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Mae'r cyfrinair yn wag!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Nid yw'r cyfrineiriau'n debyg!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new server" -msgid "Add a New User" -msgstr "Ychwanegwch weinydd newydd" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create version" -msgid "Create User" -msgstr "Crëwch fersiwn" - -#: js/messages.php:48 -#, fuzzy -#| msgid "No Privileges" -msgid "Reloading Privileges" -msgstr "Dim Breintiau" - -#: js/messages.php:49 -msgid "Removing Selected Users" -msgstr "" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "Cau" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Diddymu" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "llwytho" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Prosesau" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Ailenwch y gronfa ddata i" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Cronfa ddata" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Copïwch y gronfa ddata i" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Set nodau" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one column." -msgid "Table must have atleast 1 column" -msgstr "Mae'n rhaid i'r tabl gael o leiaf un golofn." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Crëwch dabl" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Chwilio" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Cafodd yr addasiadau eu cadw" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Perthynas wedi'i ddileu" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "Perthynas FOREIGN KEY wedi'i ychwanegu" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Perthynas mewnol wedi'i ychwanegu" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Gwall: Perthynas heb ei ychwanegu." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Gwall: perthynas yn bodoli yn barod." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Gwall wrth gadw cyfesurynnau ar gyfer y Dyluniwr." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Nodweddion perthynas cyffredinol" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Analluogwyd" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Dewis Allwedd Estron" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 msgid "Choose column to display" msgstr "Dewis colofn i'w dangos" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 msgid "Done" msgstr "Gorffen" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 msgid "Prev" msgstr "Cynt" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Nesaf" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 msgid "Today" msgstr "Heddiw" -#: js/messages.php:111 +#: js/messages.php:82 msgid "January" msgstr "Ionawr" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "Chwefror" -#: js/messages.php:113 +#: js/messages.php:84 msgid "March" msgstr "Mawrth" -#: js/messages.php:114 +#: js/messages.php:85 msgid "April" msgstr "Ebrill" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Mai" -#: js/messages.php:116 +#: js/messages.php:87 msgid "June" msgstr "Mehefin" -#: js/messages.php:117 +#: js/messages.php:88 msgid "July" msgstr "Gorffennaf" -#: js/messages.php:118 +#: js/messages.php:89 msgid "August" msgstr "Awst" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "Medi" -#: js/messages.php:120 +#: js/messages.php:91 msgid "October" msgstr "Hydref" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "Tachwedd" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "Rhagfyr" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Ion" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Chwe" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Maw" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Ebr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 msgctxt "Short month name" msgid "May" msgstr "Mai" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Meh" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Gor" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Aws" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Med" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Hyd" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Tach" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Rhag" -#: js/messages.php:151 +#: js/messages.php:122 msgid "Sunday" msgstr "Dydd Sul" -#: js/messages.php:152 +#: js/messages.php:123 msgid "Monday" msgstr "Dydd Llun" -#: js/messages.php:153 +#: js/messages.php:124 msgid "Tuesday" msgstr "Dydd Mawrth" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "DYdd Mercher" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "Dydd Iau" -#: js/messages.php:156 +#: js/messages.php:127 msgid "Friday" msgstr "Dydd Gwener" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "Dydd Sadwrn" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Sul" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Llun" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Maw" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Mer" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Iau" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Gwe" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sad" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 msgid "Su" msgstr "Su" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 msgid "Mo" msgstr "Llu" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 msgid "Tu" msgstr "Ma" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 msgid "We" msgstr "Me" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 msgid "Th" msgstr "Ia" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 msgid "Fr" msgstr "Gw" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 msgid "Sa" msgstr "Sa" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "Wy" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "Awr" -#: js/messages.php:194 +#: js/messages.php:165 msgid "Minute" msgstr "Munud" -#: js/messages.php:195 +#: js/messages.php:166 msgid "Second" msgstr "Eiliad" @@ -1475,7 +1295,7 @@ msgstr "Indecsau" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unigryw" @@ -1493,7 +1313,7 @@ msgid "Comment" msgstr "Sylw" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1518,8 +1338,8 @@ msgstr "" "Mae'n edrych fel bod yr indecsau %1$s a %2$s yn hafal. Gallwch chi dynnu un " "ohonyn nhw." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Cronfeydd Data" @@ -1690,11 +1510,7 @@ msgstr "Cyfrinair:" msgid "Server Choice" msgstr "Dewis Gweinydd" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Mae'n rhaid bod cwcis wedi'u galluogi heibio'r pwynt hwn." @@ -1771,11 +1587,7 @@ msgid "" "necessary extensions appear to be loaded. Check your PHP configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "Indecs gweinydd annilys: %s" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" "Enw gwesteiwr annilys ar gyfer gweinydd %1$s. Adolygwch eich ffurfwedd." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Gweinydd" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Dylech uwchraddio i %s %s neu'n well." @@ -1871,7 +1655,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dogfennaeth" @@ -1885,136 +1669,136 @@ msgstr "Ymholiad SQL" msgid "MySQL said: " msgstr "Dywedodd MySQL:" -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Esbonio SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Sgipio Esbonio SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "Heb God PHP" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Creu Cod PHP" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Adfywio" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Sgipio Dilysu SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Dilysu SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "Golygu mewnol yr ymholiad hwn" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "Mewnol" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Proffilio" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Amser" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "B" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EiB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%B %d, %Y am %I:%M %p" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s diwrnod, %s awr, %s munud a %s eiliad" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Dechrau" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Cynt" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Diwedd" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Neidio i gronfa ddata "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2033,7 +1817,7 @@ msgid "Events" msgstr "Digwyddiadau" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Enw" @@ -2061,15 +1845,15 @@ msgstr "Ymholiad" msgid "Designer" msgstr "Dyluniwr" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Mewnforio" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Breintiau" @@ -2088,11 +1872,7 @@ msgid "" msgstr "" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Gorbenion" @@ -2109,7 +1889,7 @@ msgstr "Dyw'r gweinydd ddim yn ymateb" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Manylion..." @@ -2119,36 +1899,22 @@ msgid "Change password" msgstr "Newid cyfrinair" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Dim Cyfrinair" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Cyfrinair" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Ail-deipiwch" @@ -2161,20 +1927,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0-cytûn" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Generadu Cyfrinair" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Generadu" @@ -2187,17 +1945,21 @@ msgstr "Creu cronfa ddata newydd" msgid "Create" msgstr "Creu" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Dim Breintiau" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +msgid "Table must have at least one column." +msgstr "Mae'n rhaid i'r tabl gael o leiaf un golofn." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Creu tabl mewn cronfa ddata %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 msgid "Number of columns" msgstr "Nifer y colofnau" @@ -2256,11 +2018,7 @@ msgid "remember template" msgstr "cofio templed" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Set nodau'r ffeil:" @@ -2271,7 +2029,7 @@ msgstr "Cywasgiad" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Dim" @@ -2315,11 +2073,7 @@ msgstr "" msgid "File to import" msgstr "Ffeil i'w mewnforio" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Lleoliad y ffeil destun" @@ -2327,22 +2081,14 @@ msgstr "Lleoliad y ffeil destun" msgid "File uploads are not allowed on this server." msgstr "Dyw lanlwytho ffeiliau ddim yn cael ei ganiatáu ar y gweinydd hwn." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "" "Does dim modd cyrraedd y cyfeiriadur a osodoch chi ar gyfer gwaith a " "lanwlythwyd" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "cyfeiriadur lanlwytho y gweinydd gwe" @@ -2469,11 +2215,7 @@ msgstr "Trefnu gan allwedd" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Opsiynau" @@ -2541,14 +2283,14 @@ msgstr "Yn dangos rhesi" msgid "total" msgstr "cyfanswm" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Cymerodd yr ymholiad %01.4f eiliad" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Newid" @@ -2614,11 +2356,7 @@ msgstr "Defnydd Pwll Byffer" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Cyfanswm" @@ -2863,11 +2601,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Fformat" @@ -2931,13 +2665,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Data" @@ -2986,15 +2715,9 @@ msgstr "Math MIME" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Gwesteiwr" @@ -3187,7 +2910,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "" @@ -3199,7 +2922,7 @@ msgstr "" msgid "Generated by" msgstr "" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "" @@ -3342,20 +3065,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Cynradd" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Indecs" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Testunllawn" @@ -3580,6 +3303,10 @@ msgstr "" msgid "not OK" msgstr "" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "" @@ -3601,7 +3328,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "" @@ -3652,13 +3379,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "" @@ -3675,22 +3397,14 @@ msgstr "Statws y meistr" msgid "Slave status" msgstr "Statws y caeth" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Newidyn" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Gwerth" @@ -3708,40 +3422,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Unrhyw ddefnyddiwr" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Defnyddiwch faes testun" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Unrhyw westeiwr" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Lleol" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Y Gwesteiwr Hwn" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Defnyddiwch Dabl Gwesteiwyr" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3765,7 +3450,6 @@ msgid "Use Host Table" msgstr "Defnyddiwch Dabl Gwesteiwyr" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3799,29 +3483,29 @@ msgstr "Iaith anhysbys: %1$s." msgid "Servers" msgstr "Gweinyddion" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Newidynnau" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Setiau nod" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Peiriannau" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Log deuaidd" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Prosesau" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Cydamseru" @@ -3848,49 +3532,49 @@ msgstr "Gwahaniaeth" msgid "Target database" msgstr "Cronfa ddata targed" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 msgid "Columns" msgstr "Colofnau" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Clustnodwch yr ymholiad SQL hwn" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Cyfyngydd" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Dangoswch yr ymholiad hwn yma eto" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Gyrru" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Dangos yn unig" @@ -4032,12 +3716,12 @@ msgstr "Diffiniad PARTITION" msgid "Save" msgstr "Cadw" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, php-format msgid "Add %s column(s)" msgstr "Ychwanegwch %s colofn" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 msgid "You have to add at least one column." msgstr "Rydych chi wedi ychwanegu o leiaf un golofn." @@ -4169,8 +3853,8 @@ msgstr "Ailosod" msgid "Protocol version" msgstr "Fersiwn protocol" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Defnyddiwr" @@ -4583,320 +4267,320 @@ msgstr "Peiriannau Storio" msgid "View dump (schema) of databases" msgstr "Gwylio dadlwythiad (sgema) cronfeydd data" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "" -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "" -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "" -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "" -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "" -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "" -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "" -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "" -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "" -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "" -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "" -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "" -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "" -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "" -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "" -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." msgstr "" -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "" -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "" -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "" -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "" -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "" -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "" -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " "killing threads of other users." msgstr "" -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "" -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "" -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 msgctxt "None privileges" msgid "None" msgstr "Dim" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr "" -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 msgid "No user found." msgstr "" -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "" -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "" -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "" -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "" -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "" -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "" -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -4905,89 +4589,89 @@ msgid "" "sreload the privileges%s before you continue." msgstr "" -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "" -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "" -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "" -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr "" -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 msgctxt "Create none database for user" msgid "None" msgstr "" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "" @@ -7562,25 +7246,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "" @@ -7630,13 +7314,6 @@ msgstr "" msgid "Show insert query" msgstr "Dangos ymholiad mewnosod" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "ac yna" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Dychwelyd i'r dudalen flaenorol" @@ -7717,7 +7394,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -7829,41 +7506,6 @@ msgstr "" msgid "Show tables" msgstr "" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "" @@ -7897,7 +7539,6 @@ msgid "Row length" msgstr "" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "" @@ -7962,47 +7603,47 @@ msgstr "" msgid "Column %s has been dropped" msgstr "" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "" -#: tbl_structure.php:538 +#: tbl_structure.php:540 msgid "Add column" msgstr "" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, php-format msgid "Create an index on  %s columns" msgstr "" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8044,6 +7685,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "Cau" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/da.po b/po/da.po old mode 100755 new mode 100644 index 45c87503a..ac69fd6a5 --- a/po/da.po +++ b/po/da.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:13+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: danish \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Vis alle" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Søg" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Udfør" @@ -113,7 +93,7 @@ msgstr "Brug denne værdi" msgid "Database %1$s has been created." msgstr "" -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Databasekommentar: " @@ -140,17 +120,10 @@ msgstr "Kolonnenavne" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Datatype" @@ -163,7 +136,7 @@ msgstr "Datatype" msgid "Null" msgstr "Nulværdi" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -187,24 +160,18 @@ msgstr "Linker til" msgid "Comments" msgstr "Kommentarer" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Nej" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -213,15 +180,9 @@ msgstr "Nej" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -240,141 +201,133 @@ msgstr "Vis dump (skema) af database" msgid "No tables found in database." msgstr "Ingen tabeller fundet i databasen." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Vælg alle" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Fravælg alle" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Databasenavnet er tomt!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Database %s er blevet omdøbt til %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Database %s er blevet kopieret til %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Omdøb database til" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Kommando" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "og derefter" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Kopiér database til" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Kun strukturen" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Struktur og data" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Kun data" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREATE DATABASE før kopiering" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Tilføj %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Tilføj AUTO_INCREMENT værdi" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Tilføj begrænsninger" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Skift til den kopierede database" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Status" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Slået til" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair table" msgctxt "BLOB repository" msgid "Repair" msgstr "Reparer tabel" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Slået fra" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Kollation (Collation)" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -383,14 +336,14 @@ msgstr "" "De ekstra features for at arbejde med linkede tabeller er deaktiveret. For " "at se hvorfor, klik %sher%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Redigér PDF-sider" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -399,11 +352,7 @@ msgstr "Tabel" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Rækker" @@ -411,42 +360,30 @@ msgstr "Rækker" msgid "Size" msgstr "Størrelse" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "i brug" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Oprettelse" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Sidste opdatering" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Sidste check" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -507,11 +444,7 @@ msgstr "Del (Slet)" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Eller" @@ -545,85 +478,85 @@ msgstr "Benyt tabeller" msgid "SQL query on database %s:" msgstr "SQL-forespørgsel til database %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Send forespørgsel" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Adgang Nægtet" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "mindst et af ordene" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "alle ordene" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "den nøjagtige sætning" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "som regulært udtryk" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Søgeresultater for \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s hit(s) i tabel %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Vis" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Slet" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Total: %s hit(s)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Søg i databasen" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Ord eller værdi(er) (jokertegn: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Find:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Ord adskilles af mellemrums-karakter (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Indeni tabel(ler):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -631,36 +564,36 @@ msgstr "Indeni tabel(ler):" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Indsæt" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Struktur" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Slet" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Tøm" @@ -670,117 +603,111 @@ msgstr "Tøm" msgid "Table %s has been emptied" msgstr "Tabel %s er tømt" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Visning %s er blevet droppet" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Tabel %s er slettet" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Visning" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replikering" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Sum" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s er standard datalageret på denne MySQL-server." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Med det markerede:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Afmærk alt" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Fjern alle mærker" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Check tabeller der har overhead" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Vis (udskriftvenlig)" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Tjek tabel" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimer tabel" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Reparer tabel" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analysér tabel" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Eksport" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Data Dictionary" @@ -791,10 +718,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -814,8 +741,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Handling" @@ -849,8 +776,8 @@ msgstr "" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "" @@ -934,7 +861,7 @@ msgstr "Bogmærket er fjernet." msgid "Showing bookmark" msgstr "Viser bogmærke" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Bogmærke %s oprettet" @@ -1019,296 +946,187 @@ msgstr "Der er intet værtsnavn!" msgid "The user name is empty!" msgstr "Intet brugernavn!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Der er ikke angivet noget kodeord!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "De to kodeord er ikke ens!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Tilføj en ny bruger" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create" -msgid "Create User" -msgstr "Opret" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Genindlæs privilegier" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Fjern valgte brugere" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Annuller" -#: js/messages.php:57 -#, fuzzy -#| msgid "Log in" -msgid "Loading" -msgstr "Login" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Processer" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Omdøb database til" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Database" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Kopiér database til" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Tegnsæt" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Tabellen skal indeholde mindst ét felt." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Opret tabel" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Søg" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Rettelserne er gemt!" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Relation slettet" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Intern relation tilføjet" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Fejl: Relation ikke tilføjet." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Fejl: Relation findes allerede." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Fejl ved lagring af koordinater for Designer." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Generelle relationsmuligheder" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Slået fra" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Vælg refereret nøgle" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Vælg fremmednøgle" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Vælg venligst den primære nøgle eller en unik nøgle" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Vælg felt der skal vises" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "Ingen" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Forrige" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Næste" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Total" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr " Binært " -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "mar" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "apr" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "maj" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "jun" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "jul" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "aug" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "okt" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "jan" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "feb" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "apr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1316,176 +1134,176 @@ msgid "May" msgstr "maj" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "jun" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "jul" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "aug" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "sep" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "okt" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "nov" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "dec" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "søn" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "man" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "tir" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "fre" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "søn" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "man" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "tir" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "ons" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "tor" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "fre" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "lør" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "søn" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "man" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "tir" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "ons" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "tor" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "fre" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "lør" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "i brug" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1544,7 +1362,7 @@ msgstr "Indeks" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unik" @@ -1562,7 +1380,7 @@ msgid "Comment" msgstr "" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1585,8 +1403,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Databaser" @@ -1758,11 +1576,7 @@ msgstr "Kodeord:" msgid "Server Choice" msgstr "Server valg" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Herefter skal cookies være slået til." @@ -1843,11 +1657,7 @@ msgstr "" "Kan ikke bruge iconv ejheller libiconv eller recode_string funktionen omend " "udvidelsen ser ud til at være indlæst. Check din PHP-konfiguration." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Hvis du får en blank side, er alt i orden." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Kunne ikke indlæse standardkonfiguration fra: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1884,49 +1686,29 @@ msgstr "" "$cfg['PmaAbsoluteUri'] direktivet SKAL være sat i din " "konfigurationsfil!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Ugyldigt server indeks: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" "Ugyldigt hostnavn for server %1$s. Gennemgå venligst din konfiguration." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Server" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Ugyldig autorisationsmetode sat i konfiguration:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Ugyldig autorisationsmetode sat i konfiguration:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Du burde opdatere til %s %s eller senere." @@ -1952,7 +1734,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentation" @@ -1966,138 +1748,138 @@ msgstr "SQL-forespørgsel" msgid "MySQL said: " msgstr "MySQL returnerede: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Forklar SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Spring over Forklar SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "uden PHP-kode" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Fremstil PHP-kode" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Opdatér" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Spring over Validér SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Validér SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Lagre" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Tid" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "B" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EiB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "." #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d. %m %Y kl. %H:%M:%S" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s dage, %s timer, %s minutter og %s sekunder" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Start" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Forrige" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Slut" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Hop til database "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "Funktionaliteten af %s er påvirket af en kendt fejl, se %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2118,7 +1900,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Navn" @@ -2146,15 +1928,15 @@ msgstr "Foresp. via eks." msgid "Designer" msgstr "Designer" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Import" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privilegier" @@ -2173,11 +1955,7 @@ msgid "" msgstr "Kan være anslået. Se FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Overhead" @@ -2195,7 +1973,7 @@ msgstr "Serveren svarer ikke" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(eller den lokale MySQL servers socket er ikke korrekt konfigureret)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2205,36 +1983,22 @@ msgid "Change password" msgstr "Ændre kodeord" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Intet kodeord" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Kodeord" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Skriv igen" @@ -2249,20 +2013,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 kompatibel" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Generér Kodeord" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Generér" @@ -2275,17 +2031,23 @@ msgstr "Opret ny database" msgid "Create" msgstr "Opret" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Ingen privilegier" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Tabellen skal indeholde mindst ét felt." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Opret ny tabel i database %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2350,11 +2112,7 @@ msgid "remember template" msgstr "husk skabelonen" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Tegnsæt for filen:" @@ -2365,7 +2123,7 @@ msgstr "Komprimering" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Ingen" @@ -2407,11 +2165,7 @@ msgstr "" msgid "File to import" msgstr "Fil til import" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Tekstfilens placering" @@ -2419,20 +2173,12 @@ msgstr "Tekstfilens placering" msgid "File uploads are not allowed on this server." msgstr "Fil-uploads er ikke tilladte på denne server." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Mappen du har sat til upload-arbejde kan ikke findes" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "webserver upload-mappe" @@ -2568,11 +2314,7 @@ msgstr "Sorteringsnøgle" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Indstillinger" @@ -2642,14 +2384,14 @@ msgstr "Viser poster " msgid "total" msgstr "total" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Forepørgsel tog %01.4f sek" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Ændre" @@ -2719,11 +2461,7 @@ msgstr "Buffer Pool Forbrug" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Total" @@ -2982,11 +2720,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Format" @@ -3058,13 +2792,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Data" @@ -3113,15 +2842,9 @@ msgstr "MIME-type" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Vært" @@ -3316,7 +3039,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "Åbn nyt phpMyAdmin vindue" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "" @@ -3328,7 +3051,7 @@ msgstr "SQL-resultat" msgid "Generated by" msgstr "Genereret af" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL returnerede ingen data (fx ingen rækker)." @@ -3474,20 +3197,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primær" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Indeks" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Fuldtekst" @@ -3712,6 +3435,10 @@ msgstr "Dette format har ingen indstillinger" msgid "not OK" msgstr "ikke OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Slået til" @@ -3735,7 +3462,7 @@ msgstr "" "Se venligst Dokumentationen for oplysninger om hvordan du opdaterer din " "Column_comments (kolonne-kommentarer) tabel" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "SQL-forespørgsel med bogmærke" @@ -3786,13 +3513,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Brugernavn" @@ -3809,22 +3531,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Variabel" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Værdi" @@ -3842,40 +3556,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Enhver bruger" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Brug tekstfelt" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Enhver vært" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Lokal" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Denne Host" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Brug Host Tabel" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3899,7 +3584,6 @@ msgid "Use Host Table" msgstr "Brug Host Tabel" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3933,29 +3617,29 @@ msgstr "Ukendt sprog: %1$s." msgid "Servers" msgstr "Servere" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Variabler" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Tegnsæt" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Lagre" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Binær log" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Processer" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3982,51 +3666,51 @@ msgstr "" msgid "Target database" msgstr "" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Kør SQL-forespørgsel/forespørgsler på server %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Kør SQL-forspørgsel(er) på database %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Kolonnenavne" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Lav bogmærke til denne SQL-forespørgsel" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Lad alle brugere bruge dette bogmærke" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Erstat eksisterende bogmærke af samme navn" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Overskriv ikke denne forespørgsel fra udenfor vinduet" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Adskiller" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Vis forespørgslen her igen " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Send" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Kun oversigt" @@ -4205,13 +3889,13 @@ msgstr "" msgid "Save" msgstr "Gem" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "Tilføj %s felt(er)" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4424,8 +4108,8 @@ msgstr "Nulstil" msgid "Protocol version" msgstr "Protokolversion" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Bruger" @@ -4873,114 +4557,114 @@ msgstr "Datalagre" msgid "View dump (schema) of databases" msgstr "Vis dump (skema) for databaser" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Inkluderer alle privilegier pånær GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Tillader ændring af strukturen på eksisterende tabeller." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Tillader ændring og sletning af gemte rutiner." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Tillader oprettelse af nye databaser og tabeller." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Tillader oprettelse af gemte rutiner." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Tillader oprettelse af nye tabeller." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Tillader oprettelse af midlertidige tabeller." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Tillader oprettelse, sletning og omdøbning af brugerkonti." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Tillader oprettelse af nye Allows creating new views." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Tillader sletning af data." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Tillader at droppe databaser og tabeller." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Tillader at droppe tabeller." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Tillader udførelse af gemte rutiner." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Tillader import af data fra og eksport af data til filer." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Tillader oprettelse af brugere og privilegier uden at genindlæse privilegie-" "tabellerne." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Tillader at skabe og droppe indeks." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Tillader indsættelse og erstatning af data." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Tillader låsning af tabeller for nuværende tråd." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Begrænser antallet af nye forbindelser brugeren må åbne pr. time." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Begrænser antallet af forespørgsler brugeren må sende til serveren pr. time." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4988,58 +4672,58 @@ msgstr "" "Begrænser antallet af kommandoer som ændrer enhver tabel eller database " "brugeren må udføre pr. time." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Begrænser antallet af samtidige forbindelser brugere må have." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Har ingen effekt i denne MySQL version." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "Tillader genindlæsning af serverindstillinger og tømning af caches." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Giver brugeren rettigheder til at spørge hvor Slaves / Masters er." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Nødvendigt for replikationsslaverne." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Tillader læsning af data." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Giver adgang til den fuldstændige liste over databaser." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Tillader udførelse af SHOW CREATE VIEW forespørgsler." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Tillader nedlukning af serveren." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5049,158 +4733,158 @@ msgstr "" "Nødvendigt for de fleste administrative operationer som indstilling af " "globale variabler eller for at dræbe andre brugeres tråde." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Tillader ændring af data." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Ingen privilegier." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Ingen" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Tabel-specifikke privilegier" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " NB: Navne på MySQL privilegier er på engelsk " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Globale privilegier" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Database-specifikke privilegier" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administration" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Ressourcebegrænsninger" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" "Bemærk: Indstilling af disse værdier til 0 (nul) fjerner begrænsningen." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Login-information" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Kodeord må ikke ændres" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Ingen bruger(e) fundet." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Brugeren %s findes i forvejen!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Du har tilføjet en ny bruger." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Du har opdateret privilegierne for %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Du har tilbagekaldt privilegierne for %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Kodeordet for %s blev korrekt udskiftet." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Sletter %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Ingen brugere valgt til sletning!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Genindlæs privilegierne" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "De valgte brugere er blevet korrekt slettet." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Privilegierne blev korrekt genindlæst." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Ret privilegier" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Tilbagekald" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Brugeroversigt" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Tildel" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Enhver" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Tilføj en ny bruger" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Fjern valgte brugere" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Tilbagekald alle aktive privilegier fra brugerne og slet dem efterfølgende." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Drop databaser der har samme navne som brugernes." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5214,50 +4898,50 @@ msgstr "" "ændringer i den. Hvis dette er tilfældet, bør du %sgenindlæse privilegierne%" "s før du fortsætter." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Den valgte bruger blev ikke fundet i privilegietabellen." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Kolonne-specifikke privilegier" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Tilføj privilegier på følgende database" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Tilføj privileges på følgende tabel" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Ret Login-information / Kopiér bruger" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Opret en bruger med samme privilegier og ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... behold den gamle." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... slet den gamle fra brugertabellerne." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... tilbagekald alle aktive privilegier fra den gamle og slet den " "efterfølgende." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5265,44 +4949,44 @@ msgstr "" " ... slet den gamle fra brugertabellerne og genindlæs privilegierne " "efterfølgende." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Database for bruger" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Ingen" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Opret database med samme navn og tildel alle privilegier" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Tildel alle privilegier til jokertegn-navn (brugernavn_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Brugere med adgang til "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "global" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "database-specifik" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "jokertegn" @@ -8004,25 +7688,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Viser som PHP-kode" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Viser SQL-forespørgsel" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Problemer med indeksene på tabel `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Mærke" @@ -8074,13 +7758,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "og derefter" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Tilbage til foregående side" @@ -8162,7 +7839,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Føj til indeks  %s kolonne(r)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Kolonneantal skal være større end nul." @@ -8276,41 +7953,6 @@ msgstr "Check reference-integriteten" msgid "Show tables" msgstr "Vis tabeller" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Pladsforbrug" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Benyttelse" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Effektiv" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Række-statistik" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Erklæringer" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dynamisk" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Rækkelængde" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Pladsforbrug" @@ -8344,7 +7986,6 @@ msgid "Row length" msgstr "Rækkelængde" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Rækkestørrelse " @@ -8416,50 +8057,50 @@ msgstr "Ingen" msgid "Column %s has been dropped" msgstr "Tabel %s er slettet" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "En primær nøgle er blevet tilføjet til %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Der er tilføjet et indeks til %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Se Relationer" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Foreslå tabelstruktur" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "Tilføj %s felt(er)" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "I slutningen af tabel" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "I begyndelsen af tabel" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Efter %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Dan et indeks på %s kolonner" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8501,6 +8142,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8875,6 +8520,9 @@ msgstr "" #~ msgid "Process list" #~ msgstr "Procesliste" +#~ msgid "Reload privileges" +#~ msgstr "Genindlæs privilegier" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/de.po b/po/de.po old mode 100755 new mode 100644 index c085c08da..a1cc52447 --- a/po/de.po +++ b/po/de.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-06-03 21:04+0200\n" "Last-Translator: \n" "Language-Team: german \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Alles anzeigen" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Suche" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "OK" @@ -114,7 +94,7 @@ msgstr "Diesen Wert verwenden" msgid "Database %1$s has been created." msgstr "Die Datenbank %1$s wurde erzeugt." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Datenbankkommentar: " @@ -141,17 +121,10 @@ msgstr "Spaltennamen" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Typ" @@ -164,7 +137,7 @@ msgstr "Typ" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -188,24 +161,18 @@ msgstr "Verweise" msgid "Comments" msgstr "Kommentare" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Nein" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -214,15 +181,9 @@ msgstr "Nein" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -241,135 +202,127 @@ msgstr "Dump (Schema) der Datenbank anzeigen" msgid "No tables found in database." msgstr "Es wurden keine Tabellen in der Datenbank gefunden." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Alle auswählen" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Auswahl entfernen" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Der Datenbankname ist leer!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Datenbank %s wurde umbenannt zu %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Datenbank %s wurde nach %s kopiert" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Datenbank umbenennen in" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Befehl" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "und dann" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Datenbank kopieren nach" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Nur Struktur" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Struktur und Daten" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Nur Daten" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "Vor dem Kopieren CREATE DATABASE ausführen." -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Füge %s hinzu" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "AUTO_INCREMENT-Wert hinzufügen" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Constraints hinzufügen" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Zu kopierter Datenbank wechseln" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "BLOB-Repository" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Status" -#: db_operations.php:559 +#: db_operations.php:548 msgctxt "BLOB repository" msgid "Enabled" msgstr "Aktiviert" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Deaktivieren" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Beschädigt" -#: db_operations.php:577 +#: db_operations.php:566 msgctxt "BLOB repository" msgid "Repair" msgstr "Reparieren" -#: db_operations.php:585 +#: db_operations.php:574 msgctxt "BLOB repository" msgid "Disabled" msgstr "Deaktiviert" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Aktivieren" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Kollation" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -378,14 +331,14 @@ msgstr "" "Die zusätzlichen Funktionen für verknüpfte Tabellen wurden automatisch " "deaktiviert. Klicken Sie %shier%s um herauszufinden warum." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "PDF-Seiten bearbeiten" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -394,11 +347,7 @@ msgstr "Tabelle" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Zeilen" @@ -406,42 +355,30 @@ msgstr "Zeilen" msgid "Size" msgstr "Größe" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "in Benutzung" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Erzeugt am" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Aktualisiert am" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Letzter Check am" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, php-format msgid "%s table" msgid_plural "%s tables" @@ -501,11 +438,7 @@ msgstr "Entf." #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "oder" @@ -537,85 +470,85 @@ msgstr "Verwendete Tabellen" msgid "SQL query on database %s:" msgstr "SQL-Befehl in der Datenbank %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "SQL-Befehl ausführen" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Zugriff verweigert." -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "mindestens eines der Wörter" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "alle Wörter" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "genau diese Zeichenkette" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "als regulären Ausdruck" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Suchergebnisse für \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s Treffer in der Tabelle %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Anzeigen" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Löschen" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Insgesamt %s Treffer" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Durchsuche die Datenbank" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Zu suchende Wörter oder Werte (Platzhalter: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Finde:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Die Wörter werden durch Leerzeichen (\" \") getrennt." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "In der / den Tabelle(n):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -623,36 +556,36 @@ msgstr "Im Feld:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Einfügen" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Struktur" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Löschen" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Leeren" @@ -662,25 +595,25 @@ msgstr "Leeren" msgid "Table %s has been emptied" msgstr "Die Tabelle %s wurde geleert." -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Die Ansicht %s wurde gelöscht" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Die Tabelle %s wurde gelöscht." -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "Tracking ist aktiviert." -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "Tracking ist nicht aktiviert." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -689,92 +622,86 @@ msgstr "" "Dieser View hat mindestens diese Anzahl von Zeilen. Bitte lesen Sie die %" "sDokumentation%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Ansicht" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replikation" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Gesamt" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "Neue Tabellen werden standardmäßig im Format %s angelegt." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "markierte:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Alle auswählen" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Auswahl entfernen" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Tabellen m. Überhang ausw." -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Druckansicht" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Überprüfe Tabelle" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimiere Tabelle" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Repariere Tabelle" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analysiere Tabelle" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Exportieren" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Strukturverzeichnis" @@ -785,10 +712,10 @@ msgstr "Verfolgte Tabellen" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -808,8 +735,8 @@ msgstr "Aktualisiert" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Aktion" @@ -843,8 +770,8 @@ msgstr "Struktur Schnapschuss" msgid "Untracked tables" msgstr "Nicht verfolgte Tabellen" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "Verfolge Tabelle" @@ -929,7 +856,7 @@ msgstr "SQL-Abfrage wurde gelöscht." msgid "Showing bookmark" msgstr "Bookmark wird angezeigt" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Bookmark %s wurde gespeichert" @@ -1014,425 +941,316 @@ msgstr "Es wurde kein Host angegeben!" msgid "The user name is empty!" msgstr "Kein Benutzername eingegeben!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Es wurde kein Passwort angegeben!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Die eingegebenen Passwörter sind nicht identisch!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Neuen Benutzer hinzufügen" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create version" -msgid "Create User" -msgstr "Erzeuge Version" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reloading the privileges" -msgid "Reloading Privileges" -msgstr "Lade die Benutzertabellen neu" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Die ausgewählten Benutzer löschen" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "Schliesse" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Abbrechen" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Laden" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Prozesse" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Datenbank umbenennen in" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Datenbank" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Datenbank kopieren nach" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Zeichensatz" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Die Tabelle muss mindestens ein Feld haben." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Erzeuge Tabelle" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Suche" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Änderungen gespeichert." -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Verknüpfung gelöscht" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "FOREIGN KEY Relation hinzugefügt" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Interne Verknüpfung hinzugefügt" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Fehler: Verknüpfung nicht hinzugefügt." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Fehler: Verknüpfung existiert bereits." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Fehler beim speichern der Koordinaten für den Designer." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Allgemeine Verknüpfungsfunktionen" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Deaktiviert" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Wählen Sie den referenzierten Schlüssel" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Wähle Fremdschlüssel" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Bitte den PRIMARY KEY oder einen UNIQUE KEY wählen" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 msgid "Choose column to display" msgstr "Anzuzeigende Spalte auswählen" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 msgid "Done" msgstr "Fertig" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 msgid "Prev" msgstr "Vorherige" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Nächste" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 msgid "Today" msgstr "Heute" -#: js/messages.php:111 +#: js/messages.php:82 msgid "January" msgstr "Januar" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "Februar" -#: js/messages.php:113 +#: js/messages.php:84 msgid "March" msgstr "März" -#: js/messages.php:114 +#: js/messages.php:85 msgid "April" msgstr "April" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Mai" -#: js/messages.php:116 +#: js/messages.php:87 msgid "June" msgstr "Juni" -#: js/messages.php:117 +#: js/messages.php:88 msgid "July" msgstr "Juli" -#: js/messages.php:118 +#: js/messages.php:89 msgid "August" msgstr "August" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "September" -#: js/messages.php:120 +#: js/messages.php:91 msgid "October" msgstr "Oktober" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "November" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "Dezember" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Januar" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Februar" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "März" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "April" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 msgctxt "Short month name" msgid "May" msgstr "Mai" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Juni" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Juli" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "August" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "September" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Oktober" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "November" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Dezember" -#: js/messages.php:151 +#: js/messages.php:122 msgid "Sunday" msgstr "Sonntag" -#: js/messages.php:152 +#: js/messages.php:123 msgid "Monday" msgstr "Montag" -#: js/messages.php:153 +#: js/messages.php:124 msgid "Tuesday" msgstr "Dienstag" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "Mittwoch" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "Donnerstag" -#: js/messages.php:156 +#: js/messages.php:127 msgid "Friday" msgstr "Freitag" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "Samstag" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "So" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Mo" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Di" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Mi" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Do" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Fr" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sa" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 msgid "Su" msgstr "So" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 msgid "Mo" msgstr "Mo" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 msgid "Tu" msgstr "Di" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 msgid "We" msgstr "Mi" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 msgid "Th" msgstr "Do" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 msgid "Fr" msgstr "Fr" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 msgid "Sa" msgstr "Sa" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "Wo" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "Stunde" -#: js/messages.php:194 +#: js/messages.php:165 msgid "Minute" msgstr "Minute" -#: js/messages.php:195 +#: js/messages.php:166 msgid "Second" msgstr "Sekunde" @@ -1491,7 +1309,7 @@ msgstr "Indizes" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unique" @@ -1509,7 +1327,7 @@ msgid "Comment" msgstr "Kommentar" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1534,8 +1352,8 @@ msgstr "" "Die Indizes %1$s und %2$s scheinen gleich zu sein und einer könnte " "möglicherweise entfernt werden." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Datenbanken" @@ -1710,11 +1528,7 @@ msgstr "Passwort:" msgid "Server Choice" msgstr "Server Auswählen" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Ab diesem Punkt müssen Cookies aktiviert sein." @@ -1800,11 +1614,7 @@ msgstr "" "werden, obwohl die benötigten php-Erweiterungen angeblich geladen wurden. " "Bitte überprüfen Sie Ihre PHP-Konfiguration." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Wenn " "Sie eine leere Seite erhalten, ist Ihre Konfigurationsdatei in Ordnung." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "Fehler beim Laden der Standard-Konfiguration von: %1$s" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1841,49 +1643,29 @@ msgstr "" "Das $cfg['PmaAbsoluteUri']-Verzeichnis MUSS in Ihrer " "Konfigurationsdatei angegeben werden!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "Ungültige Server-Nummer: %s" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" "Ungültiger Host-Name für Server %1$s. Bitte überprüfen Sie Ihre " "Konfiguration." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Server" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Ungültige Authentifikationsmethode:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Ungültige Authentifikationsmethode:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Sie sollten auf %s %s oder neuer umsteigen." @@ -1909,7 +1691,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentation" @@ -1923,138 +1705,138 @@ msgstr "SQL-Befehl" msgid "MySQL said: " msgstr "MySQL meldet: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "SQL erklären" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "SQL-Erklärung umgehen" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "ohne PHP-Code" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "PHP-Code erzeugen" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Aktualisieren" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "SQL-Validierung umgehen" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "SQL validieren" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "Inline-Bearbeiten dieses SQL-Befehls" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "Inline" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Messen" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Dauer" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Bytes" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EiB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "." #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d. %B %Y um %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s Tage, %s Stunden, %s Minuten und %s Sekunden" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Anfang" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Vorherige" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Ende" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Zur Datenbank "%s" springen." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" "Die Funktion \"%s\" wird durch einen bekannten Fehler beeinträchtigt, siehe " "%s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2075,7 +1857,7 @@ msgid "Events" msgstr "Ereignisse" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Name" @@ -2103,15 +1885,15 @@ msgstr "Abfrageeditor" msgid "Designer" msgstr "Designer" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Importieren" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Rechte" @@ -2131,11 +1913,7 @@ msgstr "" "Es kann sich hierbei um Näherungswerte handeln. Bitte lesen Sie auch FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Überhang" @@ -2156,7 +1934,7 @@ msgstr "" "(evtl. ist auch der Socket des lokalen MySQL-Servers socket nicht korrekt " "konfiguriert)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Details ..." @@ -2166,36 +1944,22 @@ msgid "Change password" msgstr "Passwort ändern" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Kein Passwort" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Passwort" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Wiederholen" @@ -2208,20 +1972,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 kompatibel" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Passwort generieren" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Generieren" @@ -2234,17 +1990,23 @@ msgstr "Neue Datenbank anlegen" msgid "Create" msgstr "Anlegen" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Keine Rechte" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Die Tabelle muss mindestens ein Feld haben." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Neue Tabelle in Datenbank %s erstellen" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2310,11 +2072,7 @@ msgid "remember template" msgstr "Konvention merken" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Zeichencodierung der Datei:" @@ -2325,7 +2083,7 @@ msgstr "Kompression" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "keine" @@ -2373,11 +2131,7 @@ msgstr "" msgid "File to import" msgstr "Zu importierende Datei" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Datei" @@ -2385,20 +2139,12 @@ msgstr "Datei" msgid "File uploads are not allowed on this server." msgstr "Das hochladen von Dateien ist auf diesem Server nicht erlaubt." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Auf das festgelegte Upload-Verzeichnis kann nicht zugegriffen werden." -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "Upload-Verzeichnis auf dem Webserver" @@ -2534,11 +2280,7 @@ msgstr "Nach Schlüssel sortieren" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Optionen" @@ -2609,14 +2351,14 @@ msgstr "Zeige Datensätze " msgid "total" msgstr "insgesamt" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "die Abfrage dauerte %01.4f sek." #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Ändern" @@ -2686,11 +2428,7 @@ msgstr "Auslastung des Puffer-Pools" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Insgesamt" @@ -2974,11 +2712,7 @@ msgstr "" "ansonsten werden sie umbenannt und bekommen die nächsthöhere Nummer." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Format" @@ -3050,13 +2784,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Daten" @@ -3105,15 +2834,9 @@ msgstr "MIME-Typ" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Host" @@ -3309,7 +3032,7 @@ msgstr "Export-Inhalte" msgid "Open new phpMyAdmin window" msgstr "Neues phpMyAdmin-Fenster" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "Neue Tabelle" @@ -3321,7 +3044,7 @@ msgstr "SQL-Abfrageergebnis" msgid "Generated by" msgstr "Erstellt von" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL lieferte ein leeres Resultat zurück (d. h. null Zeilen)." @@ -3470,20 +3193,20 @@ msgstr "Nach Kana konvertieren" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primärschlüssel" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Index" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Volltext" @@ -3708,6 +3431,10 @@ msgstr "Für dieses Format sind keine Optionen vorhanden" msgid "not OK" msgstr "fehlerhaft" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Aktiviert" @@ -3731,7 +3458,7 @@ msgstr "" "Bitte lesen Sie in der Dokumentation nach, wie Sie die Struktur Ihrer " "Spaltenkommentartabelle aktualisieren können" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Gespeicherte SQL-Abfrage" @@ -3791,13 +3518,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Benutzername" @@ -3814,22 +3536,14 @@ msgstr "Master-Status" msgid "Slave status" msgstr "Slave-Status" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Variable" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Wert" @@ -3849,40 +3563,11 @@ msgstr "" msgid "Add slave replication user" msgstr "Benutzer für den Replication-Slave hinzufügen" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Jeder Benutzer" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Textfeld verwenden" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Jeder Host" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Lokal" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Dieser Host" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Verwende Hosttabelle" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3906,7 +3591,6 @@ msgid "Use Host Table" msgstr "Verwende Hosttabelle" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3942,29 +3626,29 @@ msgstr "Unbekannte Sprache: \"%1$s\"." msgid "Servers" msgstr "Server" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Variablen" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Zeichensätze" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Formate" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Binäres Protokoll" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Prozesse" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Gleiche ab" @@ -3992,51 +3676,51 @@ msgstr "Unterschied" msgid "Target database" msgstr "Ziel-Datenbank" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "SQL-Befehl(e) auf Server %s ausführen" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "SQL-Befehl(e) in Datenbank %s ausführen" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Spaltennamen" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "SQL-Abfrage speichern" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Diese gespeicherte SQL-Abfrage für jeden Benutzer verfügbar machen" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Überschreibe gleichnamiges Bookmark" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Abfrage vor Änderungen außerhalb des Fensters schützen" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Begrenzer" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr "Diese Abfrage hier wieder anzeigen" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Abschicken" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Nur zeigen" @@ -4216,12 +3900,12 @@ msgstr "PARTITION Definition" msgid "Save" msgstr "Speichern" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, php-format msgid "Add %s column(s)" msgstr "%s Spalte(n) einfügen" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4446,8 +4130,8 @@ msgstr "Zurücksetzen" msgid "Protocol version" msgstr "Protokoll-Version" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Benutzer" @@ -4907,117 +4591,117 @@ msgstr "Tabellenformate" msgid "View dump (schema) of databases" msgstr "Dump (Schema) der Datenbanken anzeigen" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Enthält alle Rechte bis auf GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Erlaubt das Verändern der Struktur bestehender Tabellen." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Erlaubt das Verändern und Löschen von Routinen." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Erlaubt das Erstellen neuer Datenbanken und Tabellen." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Erlaubt das Erstellen von gespeicherten Routinen." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Erlaubt das Erstellen neuer Tabellen." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Erlaubt das Erstellen temporärer Tabellen." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Erlaubt das Erstellen, Löschen und Umbenennen von Benutzern." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Erlaubt das Erstellen von Views." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Erlaubt das Löschen von Daten." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Erlaubt das Löschen ganzer Datenbanken und Tabellen." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Erlaubt das Löschen ganzer Tabellen." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Erlaubt das Anlegen von Events für den Event-Scheduler" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Erlaubt das Ausführen von Routinen." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "" "Erlaubt das Importieren von Daten aus und das Exportieren in externe Dateien." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Erlaubt das Hinzufügen von Benutzern und Rechten ohne den die " "Benutzerprofile neu laden zu müssen." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Erlaubt das Erstellen und Löschen von Indizes." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Erlaubt das Hinzufügen und Ersetzen von Daten." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Erlaubt die Sperrung bestimmter Tabellen." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Begrenzt die Anzahl neuer Verbindungen, welche ein Benutzer pro Stunde " "aufbauen darf." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Begrenzt die Anzahl der Abfragen, welche ein Benutzer pro Stunde senden darf." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5025,63 +4709,63 @@ msgstr "" "Begrenzt die Anzahl der Veränderungen, welche ein Benutzer pro Stunde an " "allen Datenbanken und Tabellen vornehmen darf." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "" "Beschränkt die Anzahl der gleichzeitigen Verbindungen für diesen Benutzer." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Erlaubt die Anzeige der Prozesse aller Benutzer" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Hat keinen Effekt in dieser MySQL-Version." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Erlaubt das erneute Laden von Servereinstellungen und das Leeren der " "Zwischenspeicher zur Laufzeit." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" "Erlaubt dem Benutzer zu fragen, wo sich die Master- bzw. Slave-Systeme " "befinden" -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Wird für die Replication-Slave-Systeme benötigt." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Erlaubt das Auslesen von Daten." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Gewährt Zugang zur vollständigen Datenbankliste." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Erlaubt das Ausführen von 'SHOW CREATE VIEW'." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Erlaubt das Beenden des Servers." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5091,154 +4775,154 @@ msgstr "" "bereits erreicht ist; Wird für viele administrative Operationen, wie das " "Setzen globaler Variables oder das Beenden fremder Prozesse, vorausgesetzt." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Erlaubt das Erzeugen und Löschen Triggern" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Erlaubt das Verändern von gespeicherten Daten." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Keine Rechte." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 msgctxt "None privileges" msgid "None" msgstr "Kein(e)" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Tabellenspezifische Rechte" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr "MySQL-Rechte werden auf Englisch angegeben." -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Globale Rechte" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Datenbankspezifische Rechte" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administration" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Ressourcenbeschränkungen" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Der Wert 0 (null) entfernt die Beschränkung." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Anmelde-Informationen" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Passwort nicht verändert" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 msgid "No user found." msgstr "Es wurde kein Benutzer gefunden." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Der Benutzer %s existiert bereits!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Der Benutzer wurde hinzugefügt." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Die Rechte für %s wurden geändert." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Sie haben die Rechte für %s entfernt." -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Das Passwort für %s wurde geändert." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Lösche %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Es wurden keine Benutzer zum Löschen ausgewählt!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Lade die Benutzertabellen neu" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Die gewählten Benutzer wurden gelöscht." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Die Benutzerprofile wurden neu geladen." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Rechte ändern" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Entfernen" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Benutzerübersicht" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "GRANT" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Jeder" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Neuen Benutzer hinzufügen" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Die ausgewählten Benutzer löschen" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Den Benutzern alle Rechte entziehen und sie anschließend aus den " "Benutzertabellen löschen." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Die gleichnamigen Datenbanken löschen." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5252,93 +4936,93 @@ msgstr "" "vorgenommen wurden. In diesem Fall sollten Sie %sdie Benutzerprofile neu " "laden%s bevor Sie fortfahren." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Der gewählte Benutzer wurde in der Benutzertabelle nicht gefunden." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Spaltenspezifische Rechte" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Rechte zu folgender Datenbank hinzufügen" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Platzhalter _ und % sollten mit einem \\ escaped werden, um das gewünschte " "Sonderzeichen einzubinden" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Rechte zu folgender Tabelle hinzufügen" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Anmelde-Information ändern / Benutzer kopieren" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Erstelle einen neuen Benutzer mit identischen Rechten und ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... behalte den alten bei." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... lösche den alten von den Benutzertabellen." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... entziehe dem alten alle Rechte und lösche ihn anschließend." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr " ... lösche den alten und lade anschließend die Benutzertabellen neu." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Datenbank für Benutzer" -#: server_privileges.php:2060 +#: server_privileges.php:2037 msgctxt "Create none database for user" msgid "None" msgstr "Kein(e)" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Erstelle eine Datenbank mit gleichem Namen und gewähre alle Rechte" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" "Gewähre alle Rechte auf Datenbanken die mit dem Benuterznamen beginnen " "(username\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "Gewähre alle Rechte auf die Datenbank "%s"" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Benutzer mit Zugriff auf "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "global" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "datenbankspezifisch" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "Platzhalter" @@ -8308,25 +7992,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "ID der eingefügten Zeile: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Ansicht als PHP Code" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Ansicht als SQL Abfrage" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Warnungen bei den Indizes der Tabelle `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Titel" @@ -8378,13 +8062,6 @@ msgstr "Als neue Zeile einfügen und Fehler ignorieren" msgid "Show insert query" msgstr "Zeige insert Abfrage" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "und dann" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "zurück" @@ -8465,7 +8142,7 @@ msgstr "Der Name des Primärschlüssels darf nur \"PRIMARY\" lauten." msgid "Add to index  %s column(s)" msgstr "%s Spalten zum Index hinzufügen" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Die Spaltenanzahl muss größer als 0 sein." @@ -8578,41 +8255,6 @@ msgstr "Prüfe referentielle Integrität:" msgid "Show tables" msgstr "Tabellen anzeigen" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Speicherplatzverbrauch" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Verbrauch" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Effektiv" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Zeilenstatistik" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Angaben" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "statisch" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dynamisch" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Zeilenlänge" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Speicherplatzverbrauch" @@ -8646,7 +8288,6 @@ msgid "Row length" msgstr "Zeilenlänge" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "Zeilengröße" @@ -8718,49 +8359,49 @@ msgstr "kein(e)" msgid "Column %s has been dropped" msgstr "Die Tabelle %s wurde gelöscht." -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Ein Primärschlüssel wurde in %s erzeugt" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Ein Index wurde in %s erzeugt" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Beziehungsübersicht" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Tabellenstruktur analysieren" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add column(s)" msgid "Add column" msgstr "Spalte(n) einfügen" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "An das Ende der Tabelle" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "An den Anfang der Tabelle" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Nach %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, php-format msgid "Create an index on  %s columns" msgstr "Index über %s Spalten anlegen" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "partitioniert" @@ -8806,6 +8447,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "SQL Befehle exportiert." +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "Schliesse" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/el.po b/po/el.po old mode 100755 new mode 100644 index 934f084b5..a98ead0ae --- a/po/el.po +++ b/po/el.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-30 23:16+0200\n" "Last-Translator: Michal \n" "Language-Team: greek \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Εμφάνιση όλων" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Αναζήτηση" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Εκτέλεση" @@ -114,7 +94,7 @@ msgstr "Χρήση αυτής της τιμής" msgid "Database %1$s has been created." msgstr "Δημιουργήθηκε η βάση δεδομένων %1$s." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Σχόλιο βάσης: " @@ -141,17 +121,10 @@ msgstr "Ονόματα στηλών" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Τύπος" @@ -164,7 +137,7 @@ msgstr "Τύπος" msgid "Null" msgstr "Κενό" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -188,24 +161,18 @@ msgstr "Σύνδεση με" msgid "Comments" msgstr "Σχόλια" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Όχι" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -214,15 +181,9 @@ msgstr "Όχι" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -241,138 +202,130 @@ msgstr "Εμφάνιση σχήματος της βάσης δεδομένων" msgid "No tables found in database." msgstr "Δεν βρέθηκαν Πίνακες στη βάση δεδομένων." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Επιλογή όλων" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Απεπιλογή όλων" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Το όνομα της βάσης δεδομένων είναι κενό!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Η βάση δεδομένων %s μετονομάστηκε σε %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Η βάση δεδομένων %s αντιγράφηκε στη %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Μετονομασία βάσης δεδομένων σε" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Εντολή" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "και μετά" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Αντιγραφή βάσης δεδομένων σε" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Μόνο η δομή" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Δομή και δεδομένα" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Μόνο τα δεδομένα" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "ΔΗΜΙΟΥΡΓΙΑ ΒΑΣΗΣ ΔΕΔΟΜΕΝΩΝ πριν την αντιγραφή" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Προσθήκη %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Προσθήκη τιμής AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Προσθήκη περιορισμών" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Αλλαγή στο αντίγραφο της βάσης δεδομένων" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "Αποθήκη BLOB" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Κατάσταση" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy msgctxt "BLOB repository" msgid "Enabled" msgstr "Ενεργοποιημένο" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Απενεργοποίηση" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Καταστράφηκε" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "Επιδιόρθωση" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy msgctxt "BLOB repository" msgid "Disabled" msgstr "Απενεργοποιημένο" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Ενεργοποίηση" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Σύνθεση" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -381,14 +334,14 @@ msgstr "" "Οι επιπρόσθετες λειτουργίες για εργασία με συσχετισμένους πίνακες έχουν " "απενεργοποιηθεί. Για να μάθετε γιατί, πατήστε %sεδώ%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Αλλαγή σελίδων PDF" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -397,11 +350,7 @@ msgstr "Πίνακας " #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Εγγραφές" @@ -409,42 +358,30 @@ msgstr "Εγγραφές" msgid "Size" msgstr "Μέγεθος" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "σε χρήση" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Δημιουργία" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Τελευταία ενημέρωση" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "τελευταίος έλεγχος" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -505,11 +442,7 @@ msgstr "Διαγραφή" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Ή" @@ -543,85 +476,85 @@ msgstr "Χρήση Πινάκων" msgid "SQL query on database %s:" msgstr "Εντολή SQL στη βάση %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Υποβολή ερωτήματος" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Άρνηση Πρόσβασης" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "τουλάχιστον έναν από τους όρους" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "όλους τους όρους" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "την ακριβή φράση" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "ως κανονική έκφραση" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Αποτελέσματα αναζήτησης για «%s» %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s αποτελέσματα στον πίνακα %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Περιήγηση" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Διαγραφή" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Σύνολο: %s αποτελέσματα" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Αναζήτηση στη βάση" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Όροι ή τιμές για αναζήτηση (μπαλαντέρ: «%»):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Έυρεση:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Οι λέξεις χωρίζονται από τον χαρακτήρα διαστήματος (« »)." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Μέσα στους πίνακες:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -629,36 +562,36 @@ msgstr "Εσωτερικό πεδίο:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Προσθήκη" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Δομή" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Διαγραφή" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Άδειασμα" @@ -668,25 +601,25 @@ msgstr "Άδειασμα" msgid "Table %s has been emptied" msgstr "Ο Πίνακας %s άδειασε" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Η προβολή %s διαγράφτηκε" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Ο Πίνακας %s διεγράφη" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "Η παρακολούθηση είναι ενεργοποιημένη." -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "Η παρακολούθηση δεν έιναι ενεργοποιημένη." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -695,93 +628,87 @@ msgstr "" "Αυτή η προβολή έχει τουλάχιστον αυτό τον αριθμό γραμμών. Λεπτομέρειες στην %" "sτεκμηρίωση%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Προβολή" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Αναπαραγωγή" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Σύνολο" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "" "Η %s είναι η προεπιλεγμένη μηχανή αποθήκευσης σε αυτόν τον διακομιστή MySQL." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Με τους επιλεγμένους:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Επιλογή όλων" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Απεπιλογή όλων" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Επιλογή πινάκων με περίσσεια" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Εμφάνιση για εκτύπωση" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Έλεγχος πίνακα" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Βελτιστοποίηση Πίνακα" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Επιδιόρθωση πίνακα" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Ανάλυση Πίνακα" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Εξαγωγή" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Περιληπτικός πίνακας δεδομένων" @@ -792,10 +719,10 @@ msgstr "Παρακολουθούμενοι πίνακες" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -815,8 +742,8 @@ msgstr "Ενημερώθηκε" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Ενέργεια" @@ -850,8 +777,8 @@ msgstr "Στιγμιότυπο δομής" msgid "Untracked tables" msgstr "Μη παρακολουθούμενοι πίνακες" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "Παρακολούθηση πίνακα" @@ -934,7 +861,7 @@ msgstr "Η ετικέτα διεγράφη." msgid "Showing bookmark" msgstr "Εμφάνιση σελιδοδείκτη" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Ο σελιδοδείκτης %s δημιουργήθηκε" @@ -1021,451 +948,342 @@ msgstr "Το όνομα του Συστήματος είναι κενό!" msgid "The user name is empty!" msgstr "Το όνομα του χρήστη είναι κενό!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Ο Κωδικός Πρόσβασης είναι κενός!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Οι κωδικοί πρόσβασης δεν είναι ίδιοι!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Προσθήκη νέου Χρήστη" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create version" -msgid "Create User" -msgstr "Δημιουργία έκδοσης" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Επαναφόρτωση δικαιωμάτων" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Διαγραφή των επιλεγμένων χρηστών" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "Κλείσιμο" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Άκυρο" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Φόρτωση" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Διεργασίες" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "Εντάξει" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Μετονομασία βάσης δεδομένων σε" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Βάση" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Αντιγραφή βάσης δεδομένων σε" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Σύνολο χαρακτήρων" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Ο πίνακας πρέπει να έχει τουλάχιστον ένα πεδίο." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Δημιουργία πίνακα" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Αναζήτηση" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Οι αλλαγές αποθηκεύτηκαν" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Η συσχέτιση διαγράφηκε" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "Προστέθηκε η συσχέτιση ΜΗ ΔΙΑΚΡΙΤΟΥ ΚΛΕΙΔΙΟΥ (FOREIGN KEY)" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Η εσωτερική συσχέτιση προστέθηκε" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Σφάλμα: Δεν προστέθηκε η συσχέτιση." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Σφάλμα: Η συσχέτιση υπαρχει ήδη." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Σφάλμα αποθήκευσης συντεταγμένων για τον Σχεδιαστή." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Γενικές λειτουργίες συσχέτισης" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Απενεργοποιημένη" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Επιλέξτε αναφερθέν κλειδί" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Επιλέξτε Μη Διακριτό Κλειδί" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Επιλέξτε το πρωτεύον κλειδί ή ένα μοναδικό κλειδί" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Επιλέξτε πεδίο για εμφάνιση" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy msgid "Done" msgstr "Δωρεά" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy msgid "Prev" msgstr "Προηγούμενο" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Επόμενο" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy msgid "Today" msgstr "Σύνολο" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy msgid "January" msgstr "Δυαδικό" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy msgid "March" msgstr "Μαρτίου" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy msgid "April" msgstr "Απριλίου" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Μαΐου" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy msgid "June" msgstr "Ιουνίου" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy msgid "July" msgstr "Ιουλίου" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy msgid "August" msgstr "Αυγούστου" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy msgid "October" msgstr "Οκτωβρίου" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Ιανουαρίου" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Φεβρουαρίου" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Μαρτίου" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Απριλίου" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy msgctxt "Short month name" msgid "May" msgstr "Μαΐου" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Ιουνίου" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Ιουλίου" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Αυγούστου" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Σεπτεμβρίου" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Οκτωβρίου" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Νοεμβρίου" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Δεκεμβρίου" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy msgid "Sunday" msgstr "Κυριακή" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy msgid "Monday" msgstr "Δευτέρα" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy msgid "Tuesday" msgstr "Τρίτη" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy msgid "Friday" msgstr "Παρασκευή" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Κυριακή" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Δευτέρα" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Τρίτη" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Τετάρτη" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Πέμπτη" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Παρασκευή" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Σάββατο" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy msgid "Su" msgstr "Κυριακή" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy msgid "Mo" msgstr "Δευτέρα" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy msgid "Tu" msgstr "Τρίτη" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy msgid "We" msgstr "Τετάρτη" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy msgid "Th" msgstr "Πέμπτη" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy msgid "Fr" msgstr "Παρασκευή" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy msgid "Sa" msgstr "Σάββατο" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy msgid "Wk" msgstr "Wiki" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy msgid "Minute" msgstr "σε χρήση" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy msgid "Second" msgstr "ανά δευτερόλεπτο" @@ -1525,7 +1343,7 @@ msgstr "Ευρετήρια" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Μοναδικό" @@ -1543,7 +1361,7 @@ msgid "Comment" msgstr "Σχόλιο" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1568,8 +1386,8 @@ msgstr "" "Τα ευρετήρια %1$s και %2$s φαίνεται να είναι ίσα και ένα από αυτά μπορεί να " "απομακρυνθεί." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Βάσεις Δεδομένων" @@ -1742,11 +1560,7 @@ msgstr "Κωδικός πρόσβασης:" msgid "Server Choice" msgstr "Επιλογή Διακομιστή" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Από αυτό το σημείο πρέπει να έχετε ενεργοποιημένα cookies." @@ -1831,11 +1645,7 @@ msgstr "" "ρουτίνας recode_string, ενώ η επέκταση έχει φορτωθεί. Ελέξτε τις ρυθμίσεις " "της php." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Εάν η php επιστρέψει μια λευκή σελίδα, όλα " "είναι σωστά." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format msgid "Could not load default configuration from: %1$s" msgstr "Αδύνατη η φόρτωση της προεπιλεγμένης ρύθμισης από: «%1$s»" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1873,49 +1675,29 @@ msgstr "" "Η εντολή $cfg['PmaAbsoluteUri'] ΠΡΕΠΕΙ να οριστεί στο αρχείο " "ρυθμίσεων!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format msgid "Invalid server index: %s" msgstr "Μη έγκυρο ευρετήριο διακομιστή: «%s»" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" "Μη έγκυρο όνομα διακομιστή για τον διακομιστή %1$s. Ξαναδείτε τις ρυθμίσεις " "σας." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Διακομιστής" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Ορίστηκε εσφαλμένη μέθοδος πιστοποίησης στη ρύθμιση:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Ορίστηκε εσφαλμένη μέθοδος πιστοποίησης στη ρύθμιση:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Πρέπει να αναβαθμίσετε σε %s %s ή νεότερη." @@ -1941,7 +1723,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Τεκμηρίωση" @@ -1955,137 +1737,137 @@ msgstr "Εντολή SQL" msgid "MySQL said: " msgstr "Η MySQL επέστρεψε το μύνημα: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Ανάλυση SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Χωρίς ανάλυση SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "χωρίς κώδικα PHP" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Δημιουργία κώδικα PHP" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Ανανέωση" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Παράβλεψη επικύρωσης SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Επικύρωση SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy msgid "Inline" msgstr "Μηχανές" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Δημιουργία προφίλ" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Χρόνος" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Bytes" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "." #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d %B %Y στις %H:%M:%S" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s μέρες, %s ώρες, %s λεπτά %s δευτερόλεπτα" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Κορυφή" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Προηγούμενο" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Τέλος" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Μεταπήδηση στην βάση «%s»." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "Η λειτουργία %s έχει επηρρεαστεί από ένα γνωστό σφάλμα. Δείτε %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "Κώδικας SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2106,7 +1888,7 @@ msgid "Events" msgstr "Συμβάντα" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Όνομα" @@ -2134,15 +1916,15 @@ msgstr "Επερώτημα κατά παράδειγμα" msgid "Designer" msgstr "Σχεδιαστής" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Εισαγωγή" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Δικαιώματα" @@ -2161,11 +1943,7 @@ msgid "" msgstr "Ίσως είναι κατά προσέγγιση. Δείτε τις ΣΑΕ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Περίσσεια" @@ -2182,7 +1960,7 @@ msgstr "Ο διακομιστής δεν αποκρίνεται" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(ή η τοπική υποδοχή του διακομιστή MySQL δεν έχει ρυθμιστεί σωστά)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Λεπτομέρειες..." @@ -2192,36 +1970,22 @@ msgid "Change password" msgstr "Αλλαγή κωδικού πρόσβασης" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Χωρίς Κωδικό Πρόσβασης" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Κωδικός Πρόσβασης" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Επαναεισαγωγή" @@ -2235,20 +1999,12 @@ msgid "MySQL 4.0 compatible" msgstr "Συμβατό με MySQL 4.0" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Παραγωγή Κωδικού Πρόσβασης" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Παραγωγή" @@ -2261,17 +2017,23 @@ msgstr "Δημιουργία νέας βάσης" msgid "Create" msgstr "Δημιουργία" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Χωρίς Δικαιώματα" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Ο πίνακας πρέπει να έχει τουλάχιστον ένα πεδίο." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Δημιουργία νέου πίνακα στη βάση %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2337,11 +2099,7 @@ msgid "remember template" msgstr "αποθήκευση μορφής" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Σύνολο χαρακτήρων του αρχείου:" @@ -2352,7 +2110,7 @@ msgstr "Συμπίεση" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Καμία" @@ -2399,11 +2157,7 @@ msgstr "" msgid "File to import" msgstr "Αρχείο για εισαγωγή" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Τοποθεσία του αρχείου κειμένου" @@ -2411,21 +2165,13 @@ msgstr "Τοποθεσία του αρχείου κειμένου" msgid "File uploads are not allowed on this server." msgstr "Οι αποστολές αρχείων δεν επιτρέπονται σε αυτό τον διακομιστή." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "" "Ο υποκατάλογος που ορίσατε για την αποθήκευση αρχείων δεν μπόρεσε να βρεθεί" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "Υποκατάλογος αποθήκευσης αρχείων διακομιστή" @@ -2561,11 +2307,7 @@ msgstr "Ταξινόμηση ανά κλειδί" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Επιλογές" @@ -2635,14 +2377,14 @@ msgstr "Εμφάνιση εγγραφής " msgid "total" msgstr "συνολικά" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Το ερώτημα χρειάστηκε %01.4f δευτερόλεπτα" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Αλλαγή" @@ -2713,11 +2455,7 @@ msgstr "Χρήση Buffer Pool" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Σύνολο" @@ -3009,11 +2747,7 @@ msgstr "" "τους δίδεται ο επόμενος αύξων αριθμός." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Μορφοποίηση" @@ -3087,13 +2821,8 @@ msgstr "Έγγραφο Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Δεδομένα" @@ -3142,15 +2871,9 @@ msgstr "Τύπος MIME" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Σύστημα" @@ -3345,7 +3068,7 @@ msgstr "Εξαγωγή περιεχομένων" msgid "Open new phpMyAdmin window" msgstr "Άνοιγμα νέου παραθύρου phpMyAdmin" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "Νέος πίνακας" @@ -3357,7 +3080,7 @@ msgstr "αποτέλεσμα SQL" msgid "Generated by" msgstr "Δημιουργήθηκε από:" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "" @@ -3506,20 +3229,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Πρωτεύον" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Ευρετήριο" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Πλήρες κείμενο" @@ -3744,6 +3467,10 @@ msgstr "Αυτή η μορφή δεν έχει επιλογές" msgid "not OK" msgstr "ΛΑΘΟΣ" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "Εντάξει" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Ενεργοποιημένη" @@ -3767,7 +3494,7 @@ msgstr "" "Παρακαλώ διαβάστε στην τεκμηρίωση για το πως μπορείτε να ανανεώσετε τον " "πίνακα Column_comments" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Αποθηκευμένο ερώτημα SQL" @@ -3820,13 +3547,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Όνομα χρήστη" @@ -3843,22 +3565,14 @@ msgstr "Κατάσταση πρωτεύοντος" msgid "Slave status" msgstr "Κατάσταση δευτερεύοντος" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Μεταβλητή" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Τιμή" @@ -3878,40 +3592,11 @@ msgstr "" msgid "Add slave replication user" msgstr "Προσθήκη δευτερέοντα χρήστη αναπαραγωγής" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Οποιοσδήποτε Χρήστης" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Χρησιμοποιήστε το πεδίο κειμένου" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Οποιοδήποτε Σύστημα" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Τοπικό" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Αυτός ο διακομιστής" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Χρήση Οικείου Πίνακα" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3935,7 +3620,6 @@ msgid "Use Host Table" msgstr "Χρήση Οικείου Πίνακα" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3971,29 +3655,29 @@ msgstr "Άγνωστη γλώσσα: %1$s." msgid "Servers" msgstr "Διακομιστές" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Μεταβλητές" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Σύνολο χαρακτήρων" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Μηχανές" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Δυαδικό αρχείο καταγραφής" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Διεργασίες" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Συγχρονισμός" @@ -4020,51 +3704,51 @@ msgstr "Διαφορά" msgid "Target database" msgstr "Βάση δεδομένων προορισμού" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Εκτέλεση ερωτήματος/ερωτημάτων SQL στο διακομιστή «%s»" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Εκτέλεση εντολής/εντολών SQL στη βάση δεδομένων %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Ονόματα στηλών" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Αποθήκευση αυτού του ερωτήματος SQL" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Δικαίωμα πρόσβασης στο σελίδοδείκτη σε κάθε χρήστη" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Αντικατάσταση υπάρχοντος σελιδοδείκτη με το ίδιο όνομα" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Να μην αλλάξει το ερώτημα από εξωτερική πηγή" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Διαχωριστικό" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Επανεμφάνιση αυτού του ερώτηματος εδώ" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Αποστολή" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Μόνο ανάγνωση" @@ -4242,13 +3926,13 @@ msgstr "Ορισμός ΚΑΤΑΤΜΗΣΗΣ (PARTITION)" msgid "Save" msgstr "Αποθήκευση" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add column(s)" msgid "Add %s column(s)" msgstr "Προσθήκη στήλης(ών)" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4468,8 +4152,8 @@ msgstr "Επαναφορά" msgid "Protocol version" msgstr "Έκδοση πρωτοκόλλου" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Χρήστης" @@ -4930,117 +4614,117 @@ msgstr "Μηχανές αποθήκευσης" msgid "View dump (schema) of databases" msgstr "Εμφάνισης σχήματος βάσεων" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Περιλαμβάνει όλα τα δικαιώματα εκτός από το GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Επιτρέπει την αλλαγή δομής των υπαρχόντων πινάκων." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Επιτρέπει την αλλαγή και διαγραφή αποθηκευμένων εργασιών." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Επιτρέπει τη δημιουργία νέων βάσεων και πινάκων." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Επιτρέπει τη δημιουργία αποθηκευμένων εργασιών." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Επιτρέπει τη δημιουργία νέων πινάκων." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Επιτρέπει τη δημιουργία προσωρινών πινάκων." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Επιτρέπει τη δημιουργία, διαγραφή και μετονομασία λογαριασμών χρηστών." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Επιτρέπει τη δημιουργία νέων προβολών." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Επιτρέπει τη διαγραφή δεδομένων." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Επιτρέπει τη διαγραφή βάσεων και πινάκων." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Επιτρέπει τη διαγραφή πινάκων." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Επιτρέπει τον ορισμό συμβάντων για τον προγραμματιστή συμβάντων" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Επιτρέπει την εκτέλεση αποθηκευμένων εργασιών." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Επιτρέπει την εισαγωγή και εξαγωγή δεδομένων από και σε αρχεία." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Επιτρέπει την προσθήκη χρηστών και δικαιωμάτων χωρίς να επαναφορτώσετε τους " "πίνακες δικαιωμάτων." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Επιτρέπει την δημιουργία και την διαγραφή ευρετηρίων." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Επιτρέπει την εισαγωγή και την αντικατάσταση δεδομένων." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Επιτρέπει το κλείδωμα πινάκων για την τρέχουσα λειτουργία." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Περιορίζει τον αριθμό των νέων συνδέσεων που ο χρήστης μπορεί να ξεκινήσει " "ανά ώρα." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Περιορίζει τον αριθμό των ερωτημάτων που ο χρήστης μπορεί να στείλει στον " "διακομιστή ανά ώρα." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5048,63 +4732,63 @@ msgstr "" "Περιορίζει τον αριθμό των αλλαγής πινάκων ή βάσεων που ο χρήστης μπορεί να " "εκετελέσει ανά ώρα." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "" "Περιορίζει τον αριθμό των ταυτόχρονων συνδέσεων που μπορεί να έχει ο χρήστης." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Επιτρέπει την προβολή διεργασιών όλων των χρηστών" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Δεν έχει χρήση σε αυτήν την έκδοση MySQL." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Επιτρέπει την επανεκκίνηση του διακομιστή και τον καθαρισμό των προσωρινών " "αρχείων του." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" "Δίνει το δικαίωμα στον χρήστη να βρει που είναι οι κύριοι και δευτερεύοντες " "διακομιστές." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Απαιτείται για τους δευτερευόντες διακομιστές αναπαραγωγής." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Επιτρέπει την ανάγνωση δεδομένων." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Δίνει πρόσβαση στην πλήρη λίστα των βάσεων δεδομένων." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Επιτρέπει την εκτέλεση ερωτημάτων της μορφής SHOW CREATE VIEW." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Επιτρέπει την διακοπή λειτουργίας του διακομιστή." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5114,157 +4798,157 @@ msgstr "" "καλυθφεί; Απαιτείται για τις περισσότερες λειτουργίες διαχείρισης όπως ο " "ορισμός γενικών μεταβλητών ή τη διακοπή λειτουργιών άλλων χρηστών." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Επιτρέπει τη δημιουργία και διαγραφή υποδείξεων" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Επιτρέπει την αλλαγή δεδομένων." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Χωρίς δικαιώματα." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy msgctxt "None privileges" msgid "None" msgstr "Καμία" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Δικαιώματα πινάκων" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Σημείωση: Τα ονόματα δικαιωμάτων της MySQL εκφράζονται στα Αγγλικά " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Γενικά δικαιώματα" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Δικαιώματα βάσης δεδομένων" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Διαχείριση" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Όρια πόρων" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" "Σημείωση: Αν ορίσετε αυτές τις επιλογές σε 0 (μηδέν) αφαιρείτε ο περιορισμός." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Πληροφορίες Σύνδεσης" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Διατήρηση κωδικού πρόσβασης" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Δεν βρέθηκαν χρήστες." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Ο χρήστης %s υπάρχει ήδη!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Προσθέσατε ένα νέο χρήστη." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Τα δικαιώματα του χρήστη %s ενημερώθηκαν." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Ανακαλέσατε τα δικαιώματα για %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Ο Κωδικός Πρόσβασης για τον χρήστη %s άλλαξε επιτυχώς." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Διαγραφή %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Δεν επιλέχθηκαν χρήστες για διαγραφή!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Επαναφόρτωση δικαιωμάτων" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Οι επιλεγμένοι χρήστες διεγράφησαν επιτυχώς." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Τα δικαιώματα επαναφορτώθηκαν επιτυχώς." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Επεξεργασία Δικαιωμάτων" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Ανάκληση" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Περίληψη χρηστών" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Χορήγηση" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Οποιοδήποτε" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Προσθήκη νέου Χρήστη" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Διαγραφή των επιλεγμένων χρηστών" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Ανάκληση όλων των ενεργών δικαιώματα από τους χρήστες και διαγραφή τους." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Διαγραφή βάσεων δεδομένων που έχουν ίδια ονόματα με χρήστες." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5278,50 +4962,50 @@ msgstr "" "αλλαγές χειροκίνητα. Σε αυτήν την περίπτωση, θα πρέπει να %sεπαναφορτώσετε " "τα δικαιώματα%s πριν συνεχίσετε." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Ο επιλεγμένος χρήστης δεν βρέθηκε στον πίνακα δικαιωμάτων." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Δικαιώματα πεδίων" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Προσθήκη δικαιωμάτων στην ακόλουθη βάση δεδομένων" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Οι χαρακτήρες μπαλαντέρ _ και % πρέπει να γραφούν μπροστά με \\ για να " "χρησιμοποιηθούν" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Προσθήκη δεδομένων στον ακόλουθο πίνακα" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Αλλαγή Στοιχείων Πρόσβασης / Αντιγραφή Χρήστη" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Δημιουργία νέου χρήστη με τα ίδια δικαιώματα και ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... διατήρηση του παλιού χρήστη." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... διαγραφή του παλιού χρήστη από τους πίνακες χρηστών." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... ανάκληση των δικαιωμάτων του παλιού χρήστη και διαγραφή του." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5329,44 +5013,44 @@ msgstr "" " ... διαγραφή του παλιού χρήστη από τους πίνακες χρηστών και επαναφόρτωση " "των δικαιωμάτων." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Βάση δεδομένων για χρήστη" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy msgctxt "Create none database for user" msgid "None" msgstr "Καμία" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" "Δημιουργία βάσης δεδομένων με το ίδιο όνομα και με πλήρη δικαιώματα χρήσης" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Πλήρη δικαιώματα σε όνομα μπαλαντέρ (username\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "Πλήρη δικαιώματα στη βάση δεδομένων «%s»" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Χρήστες με πρόσβαση στη βάση «%s»" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "Γενικός" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "Χρήστης Βάσης" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "μπαλαντέρ" @@ -8376,25 +8060,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "Ταυτότητα εισερχόμενης εγγραφής: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Εμφάνιση ως κώδικά PHP" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Εμφάνιση ερωτήματος SQL" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Προβλήματα με τα ευρετήρια στον πίνακα «%s»" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Τίτλος" @@ -8449,13 +8133,6 @@ msgstr "Εισαγωγή ως νέα γραμμή και παράβλεψη σφ msgid "Show insert query" msgstr "Εμφάνιση ερωτήματος SQL" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "και μετά" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Επιστροφή" @@ -8538,7 +8215,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Προσθήκη στο ευρετήριο «%s» στήλης(ών)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Το πλήθος των στηλών δεν πρέπει να είναι μηδέν." @@ -8651,41 +8328,6 @@ msgstr "Έλεγχος ακεραιότητας συσχετίσεων:" msgid "Show tables" msgstr "Εμφάνιση πινάκων" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Χρήση χώρου" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Χρήση" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Αποτελεσματικός" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Στατιστικά Εγγραφών" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Δηλώσεις" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "στατικό" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "δυναμικά" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Μέγεθος Γραμμής" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Χρήση χώρου" @@ -8719,7 +8361,6 @@ msgid "Row length" msgstr "Μέγεθος Γραμμής" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Μέγεθος Εγγραφής " @@ -8794,49 +8435,49 @@ msgstr "Καμία" msgid "Column %s has been dropped" msgstr "Ο Πίνακας %s διεγράφη" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Ένα πρωτεύον κλειδί προστέθηκε στο %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Ένα ευρετήριο προστέθηκε στο %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Εμφάνιση συσχετίσεων" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Προτεινόμενη δομή πίνακα" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add column(s)" msgid "Add column" msgstr "Προσθήκη στήλης(ών)" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Στο τέλος του Πίνακα" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Στην αρχή του Πίνακα" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Μετά το %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format msgid "Create an index on  %s columns" msgstr "Δημιουργία ευρετηρίου σε «%s» πεδία" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "κατατμήθηκε" @@ -8880,6 +8521,10 @@ msgstr "Κάντε σχόλια αυτές τις δύο γραμμές αν δ msgid "SQL statements exported. Please copy the dump or execute it." msgstr "Οι δηλώσεις SQL εξήχθησαν. Αντιγράψτε τον κάδο ή εκτελέστε τον." +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "Κλείσιμο" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -9274,6 +8919,9 @@ msgstr "Μετονομασία πίνακα σε" #~ msgid "Process list" #~ msgstr "Λίστα διεργασιών" +#~ msgid "Reload privileges" +#~ msgstr "Επαναφόρτωση δικαιωμάτων" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/en_GB.po b/po/en_GB.po old mode 100755 new mode 100644 index 2fb055345..3dae75db1 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-06-09 10:42+0200\n" "Last-Translator: Michal \n" "Language-Team: english-gb \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Show all" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Search" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Go" @@ -114,7 +94,7 @@ msgstr "Use this value" msgid "Database %1$s has been created." msgstr "Database %1$s has been created." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Database comment: " @@ -139,17 +119,10 @@ msgstr "Column" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Type" @@ -162,7 +135,7 @@ msgstr "Type" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -186,24 +159,18 @@ msgstr "Links to" msgid "Comments" msgstr "Comments" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "No" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -212,15 +179,9 @@ msgstr "No" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -239,135 +200,127 @@ msgstr "View dump (schema) of database" msgid "No tables found in database." msgstr "No tables found in database." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Select All" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Unselect All" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "The database name is empty!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Database %s has been renamed to %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Database %s has been copied to %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Rename database to" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Command" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "and then" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Copy database to" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Structure only" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Structure and data" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Data only" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREATE DATABASE before copying" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Add %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Add AUTO_INCREMENT value" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Add constraints" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Switch to copied database" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "BLOB Repository" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Status" -#: db_operations.php:559 +#: db_operations.php:548 msgctxt "BLOB repository" msgid "Enabled" msgstr "Enabled" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Disable" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Damaged" -#: db_operations.php:577 +#: db_operations.php:566 msgctxt "BLOB repository" msgid "Repair" msgstr "Repair" -#: db_operations.php:585 +#: db_operations.php:574 msgctxt "BLOB repository" msgid "Disabled" msgstr "Disabled" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Enable" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Collation" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -376,14 +329,14 @@ msgstr "" "The additional features for working with linked tables have been " "deactivated. To find out why click %shere%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Edit PDF Pages" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -392,11 +345,7 @@ msgstr "Table" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Rows" @@ -404,42 +353,30 @@ msgstr "Rows" msgid "Size" msgstr "Size" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "in use" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Creation" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Last update" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Last check" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, php-format msgid "%s table" msgid_plural "%s tables" @@ -499,11 +436,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Or" @@ -533,120 +466,120 @@ msgstr "Use Tables" msgid "SQL query on database %s:" msgstr "SQL query on database %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Submit Query" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Access denied" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "at least one of the words" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "all words" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "the exact phrase" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "as regular expression" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Search results for \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s match(es) inside table %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Browse" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Delete" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Total: %s match(es)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Search in database" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Word(s) or value(s) to search for (wildcard: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Find:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Words are separated by a space character (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Inside table(s):" -#: db_search.php:367 +#: db_search.php:355 msgid "Inside column:" msgstr "Inside column:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Insert" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Structure" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Drop" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Empty" @@ -656,25 +589,25 @@ msgstr "Empty" msgid "Table %s has been emptied" msgstr "Table %s has been emptied" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "View %s has been dropped" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Table %s has been dropped" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "Tracking is active." -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "Tracking is not active." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -683,92 +616,86 @@ msgstr "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "View" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replication" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Sum" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s is the default storage engine on this MySQL server." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "With selected:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Check All" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Uncheck All" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Check tables having overhead" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Print view" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Check table" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimise table" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Repair table" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analyse table" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Export" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Data Dictionary" @@ -779,10 +706,10 @@ msgstr "Tracked tables" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -802,8 +729,8 @@ msgstr "Updated" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Action" @@ -837,8 +764,8 @@ msgstr "Structure snapshot" msgid "Untracked tables" msgstr "Untracked tables" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "Track table" @@ -919,7 +846,7 @@ msgstr "The bookmark has been deleted." msgid "Showing bookmark" msgstr "Showing bookmark" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Bookmark %s created" @@ -1002,425 +929,316 @@ msgstr "The host name is empty!" msgid "The user name is empty!" msgstr "The user name is empty!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "The password is empty!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "The passwords aren't the same!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Add a new User" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create version" -msgid "Create User" -msgstr "Create version" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reloading the privileges" -msgid "Reloading Privileges" -msgstr "Reloading the privileges" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Remove selected users" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "Close" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Cancel" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Load" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Processes" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Rename database to" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Database" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Copy database to" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Charset" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one column." -msgid "Table must have atleast 1 column" -msgstr "Table must have at least one column." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Create table" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Search" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Modifications have been saved" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Relation deleted" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "FOREIGN KEY relation added" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Internal relation added" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Error: Relation not added." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Error: relation already exists." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Error saving coordinates for Designer." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "General relation features" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Disabled" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Select referenced key" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Select Foreign Key" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Please select the primary key or a unique key" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 msgid "Choose column to display" msgstr "Choose column to display" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 msgid "Done" msgstr "Done" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 msgid "Prev" msgstr "Prev" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Next" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 msgid "Today" msgstr "Today" -#: js/messages.php:111 +#: js/messages.php:82 msgid "January" msgstr "January" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "February" -#: js/messages.php:113 +#: js/messages.php:84 msgid "March" msgstr "March" -#: js/messages.php:114 +#: js/messages.php:85 msgid "April" msgstr "April" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "May" -#: js/messages.php:116 +#: js/messages.php:87 msgid "June" msgstr "June" -#: js/messages.php:117 +#: js/messages.php:88 msgid "July" msgstr "July" -#: js/messages.php:118 +#: js/messages.php:89 msgid "August" msgstr "August" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "September" -#: js/messages.php:120 +#: js/messages.php:91 msgid "October" msgstr "October" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "November" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "December" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Jan" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Feb" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Apr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 msgctxt "Short month name" msgid "May" msgstr "May" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Jun" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Jul" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Aug" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Sep" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Oct" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Nov" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Dec" -#: js/messages.php:151 +#: js/messages.php:122 msgid "Sunday" msgstr "Sunday" -#: js/messages.php:152 +#: js/messages.php:123 msgid "Monday" msgstr "Monday" -#: js/messages.php:153 +#: js/messages.php:124 msgid "Tuesday" msgstr "Tuesday" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "Wednesday" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "Thursday" -#: js/messages.php:156 +#: js/messages.php:127 msgid "Friday" msgstr "Friday" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "Saturday" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Sun" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Mon" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Tue" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Wed" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Thu" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Fri" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sat" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 msgid "Su" msgstr "Su" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 msgid "Mo" msgstr "Mo" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 msgid "Tu" msgstr "Tu" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 msgid "We" msgstr "We" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 msgid "Th" msgstr "Th" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 msgid "Fr" msgstr "Fr" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 msgid "Sa" msgstr "Sa" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "Wk" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "Hour" -#: js/messages.php:194 +#: js/messages.php:165 msgid "Minute" msgstr "Minute" -#: js/messages.php:195 +#: js/messages.php:166 msgid "Second" msgstr "Second" @@ -1480,7 +1298,7 @@ msgstr "Indexes" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unique" @@ -1498,7 +1316,7 @@ msgid "Comment" msgstr "Comment" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1523,8 +1341,8 @@ msgstr "" "The indexes %1$s and %2$s seem to be equal and one of them could possibly be " "removed." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Databases" @@ -1693,11 +1511,7 @@ msgstr "Password:" msgid "Server Choice" msgstr "Server Choice" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Cookies must be enabled past this point." @@ -1778,11 +1592,7 @@ msgstr "" "Couldn't use the iconv, libiconv, or recode_string functions, although the " "necessary extensions appear to be loaded. Check your PHP configuration." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
If you receive a blank page, everything " "is fine." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "Could not load default configuration from: %1$s" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1819,47 +1621,27 @@ msgstr "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "Invalid server index: %s" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "Invalid hostname for server %1$s. Please review your configuration." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Server" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Invalid authentication method set in configuration:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Invalid authentication method set in configuration:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "You should upgrade to %s %s or later." @@ -1885,7 +1667,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Documentation" @@ -1899,136 +1681,136 @@ msgstr "SQL query" msgid "MySQL said: " msgstr "MySQL said: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Explain SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Skip Explain SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "Without PHP Code" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Create PHP Code" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Refresh" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Skip Validate SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Validate SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "Inline edit of this query" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "Inline" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Profiling" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Time" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "B" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EiB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%B %d, %Y at %I:%M %p" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s days, %s hours, %s minutes and %s seconds" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Begin" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Previous" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "End" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Jump to database "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "The %s functionality is affected by a known bug, see %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2049,7 +1831,7 @@ msgid "Events" msgstr "Events" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Name" @@ -2077,15 +1859,15 @@ msgstr "Query" msgid "Designer" msgstr "Designer" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Import" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privileges" @@ -2106,11 +1888,7 @@ msgstr "" "3.11[/a]" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Overhead" @@ -2127,7 +1905,7 @@ msgstr "The server is not responding" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(or the local MySQL server's socket is not correctly configured)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Details..." @@ -2137,36 +1915,22 @@ msgid "Change password" msgstr "Change password" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "No Password" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Password" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Re-type" @@ -2179,20 +1943,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 compatible" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Generate Password" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Generate" @@ -2205,17 +1961,21 @@ msgstr "Create new database" msgid "Create" msgstr "Create" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "No Privileges" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +msgid "Table must have at least one column." +msgstr "Table must have at least one column." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Create table on database %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 msgid "Number of columns" msgstr "Number of columns" @@ -2277,11 +2037,7 @@ msgid "remember template" msgstr "remember template" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Character set of the file:" @@ -2292,7 +2048,7 @@ msgstr "Compression" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "None" @@ -2339,11 +2095,7 @@ msgstr "" msgid "File to import" msgstr "File to import" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Location of the text file" @@ -2351,20 +2103,12 @@ msgstr "Location of the text file" msgid "File uploads are not allowed on this server." msgstr "File uploads are not allowed on this server." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "The directory you set for upload work cannot be reached" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "web server upload directory" @@ -2495,11 +2239,7 @@ msgstr "Sort by key" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Options" @@ -2567,14 +2307,14 @@ msgstr "Showing rows" msgid "total" msgstr "total" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Query took %01.4f sec" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Change" @@ -2644,11 +2384,7 @@ msgstr "Buffer Pool Usage" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Total" @@ -2933,11 +2669,7 @@ msgstr "" "number." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Format" @@ -3001,13 +2733,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Data" @@ -3056,15 +2783,9 @@ msgstr "MIME type" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Host" @@ -3257,7 +2978,7 @@ msgstr "Export contents" msgid "Open new phpMyAdmin window" msgstr "Open new phpMyAdmin window" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "New table" @@ -3269,7 +2990,7 @@ msgstr "SQL result" msgid "Generated by" msgstr "Generated by" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL returned an empty result set (i.e. zero rows)." @@ -3416,20 +3137,20 @@ msgstr "Convert to Kana" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primary" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Index" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Fulltext" @@ -3654,6 +3375,10 @@ msgstr "This format has no options" msgid "not OK" msgstr "not OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Enabled" @@ -3676,7 +3401,7 @@ msgid "" msgstr "" "Please see the documentation on how to update your column_comments table" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Bookmarked SQL query" @@ -3732,13 +3457,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "User name" @@ -3755,22 +3475,14 @@ msgstr "Master status" msgid "Slave status" msgstr "Slave status" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Variable" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Value" @@ -3790,40 +3502,11 @@ msgstr "" msgid "Add slave replication user" msgstr "Add slave replication user" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Any user" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Use text field" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Any host" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Local" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "This Host" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Use Host Table" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3847,7 +3530,6 @@ msgid "Use Host Table" msgstr "Use Host Table" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3883,29 +3565,29 @@ msgstr "Unknown language: %1$s." msgid "Servers" msgstr "Servers" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Variables" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Charsets" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Engines" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Binary log" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Processes" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Synchronise" @@ -3932,49 +3614,49 @@ msgstr "Difference" msgid "Target database" msgstr "Target database" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Run SQL query/queries on server %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Run SQL query/queries on database %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 msgid "Columns" msgstr "Columns" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Bookmark this SQL query" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Let every user access this bookmark" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Replace existing bookmark of same name" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Do not overwrite this query from outside the window" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Delimiter" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Show this query here again " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Submit" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "View only" @@ -4143,12 +3825,12 @@ msgstr "PARTITION definition" msgid "Save" msgstr "Save" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, php-format msgid "Add %s column(s)" msgstr "Add %s column(s)" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 msgid "You have to add at least one column." msgstr "You have to add at least one column." @@ -4321,8 +4003,8 @@ msgstr "Reset" msgid "Protocol version" msgstr "Protocol version" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "User" @@ -4765,112 +4447,112 @@ msgstr "Storage Engines" msgid "View dump (schema) of databases" msgstr "View dump (schema) of databases" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Includes all privileges except GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Allows altering the structure of existing tables." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Allows altering and dropping stored routines." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Allows creating new databases and tables." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Allows creating stored routines." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Allows creating new tables." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Allows creating temporary tables." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Allows creating, dropping and renaming user accounts." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Allows creating new views." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Allows deleting data." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Allows dropping databases and tables." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Allows dropping tables." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Allows to set up events for the event scheduler" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Allows executing stored routines." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Allows importing data from and exporting data into files." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Allows adding users and privileges without reloading the privilege tables." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Allows creating and dropping indexes." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Allows inserting and replacing data." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Allows locking tables for the current thread." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Limits the number of new connections the user may open per hour." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Limits the number of queries the user may send to the server per hour." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4878,58 +4560,58 @@ msgstr "" "Limits the number of commands that change any table or database the user may " "execute per hour." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Limits the number of simultaneous connections the user may have." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Allows viewing processes of all users" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Has no effect in this MySQL version." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "Allows reloading server settings and flushing the server's caches." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Allows the user to ask where the slaves / masters are." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Needed for the replication slaves." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Allows reading data." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Gives access to the complete list of databases." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Allows performing SHOW CREATE VIEW queries." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Allows shutting down the server." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -4939,153 +4621,153 @@ msgstr "" "required for most administrative operations like setting global variables or " "killing threads of other users." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Allows creating and dropping triggers" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Allows changing data." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "No privileges." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 msgctxt "None privileges" msgid "None" msgstr "None" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Table-specific privileges" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Note: MySQL privilege names are expressed in English " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Global privileges" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Database-specific privileges" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administration" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Resource limits" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Note: Setting these options to 0 (zero) removes the limit." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Login Information" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Do not change the password" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 msgid "No user found." msgstr "No user found." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "The user %s already exists!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "You have added a new user." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "You have updated the privileges for %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "You have revoked the privileges for %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "The password for %s was changed successfully." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Deleting %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "No users selected for deleting!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Reloading the privileges" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "The selected users have been deleted successfully." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "The privileges were reloaded successfully." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Edit Privileges" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Revoke" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "User overview" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Grant" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Any" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Add a new User" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Remove selected users" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Revoke all active privileges from the users and delete them afterwards." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Drop the databases that have the same names as the users." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5098,92 +4780,92 @@ msgstr "" "server uses, if they have been changed manually. In this case, you should %" "sreload the privileges%s before you continue." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "The selected user was not found in the privilege table." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Column-specific privileges" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Add privileges on the following database" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "Wildcards % and _ should be escaped with a \\ to use them literally" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Add privileges on the following table" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Change Login Information / Copy User" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Create a new user with the same privileges and ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... keep the old one." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... delete the old one from the user tables." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... revoke all active privileges from the old one and delete it afterwards." +#: server_privileges.php:2011 +msgid "" +" ... delete the old one from the user tables and reload the privileges " +"afterwards." +msgstr "" +" ... delete the old one from the user tables and reload the privileges " +"afterwards." + #: server_privileges.php:2033 -msgid "" -" ... delete the old one from the user tables and reload the privileges " -"afterwards." -msgstr "" -" ... delete the old one from the user tables and reload the privileges " -"afterwards." - -#: server_privileges.php:2056 msgid "Database for user" msgstr "Database for user" -#: server_privileges.php:2060 +#: server_privileges.php:2037 msgctxt "Create none database for user" msgid "None" msgstr "None" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Create database with same name and grant all privileges" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Grant all privileges on wildcard name (username\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "Grant all privileges on database "%s"" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Users having access to "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "global" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "database-specific" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "wildcard" @@ -8062,25 +7744,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "Inserted row id: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Showing as PHP code" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Showing SQL query" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Problems with indexes of table `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Label" @@ -8130,13 +7812,6 @@ msgstr "Insert as new row and ignore errors" msgid "Show insert query" msgstr "Show insert query" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "and then" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Go back to previous page" @@ -8217,7 +7892,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Add to index  %s column(s)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Column count has to be larger than zero." @@ -8329,41 +8004,6 @@ msgstr "Check referential integrity:" msgid "Show tables" msgstr "Show tables" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Space usage" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Usage" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Effective" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Row Statistics" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Statements" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "static" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dynamic" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Row length" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Space usage" @@ -8397,7 +8037,6 @@ msgid "Row length" msgstr "Row length" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Row size " @@ -8464,47 +8103,47 @@ msgstr "None" msgid "Column %s has been dropped" msgstr "Column %s has been dropped" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "A primary key has been added on %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "An index has been added on %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Relation view" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Propose table structure" -#: tbl_structure.php:538 +#: tbl_structure.php:540 msgid "Add column" msgstr "Add column" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "At End of Table" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "At Beginning of Table" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "After %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, php-format msgid "Create an index on  %s columns" msgstr "Create an index on  %s columns" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "partitioned" @@ -8548,6 +8187,10 @@ msgstr "Comment out these two lines if you do not need them." msgid "SQL statements exported. Please copy the dump or execute it." msgstr "SQL statements exported. Please copy the dump or execute it." +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "Close" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/es.po b/po/es.po old mode 100755 new mode 100644 index acff3f320..29d460d8e --- a/po/es.po +++ b/po/es.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 11:23+0200\n" "Last-Translator: Michal \n" "Language-Team: spanish \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Mostrar todo" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Buscar" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Continuar" @@ -114,7 +94,7 @@ msgstr "Use este valor" msgid "Database %1$s has been created." msgstr "La base de datos %1$s se creó." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Comentario de la base de datos: " @@ -141,17 +121,10 @@ msgstr "Nombre de las columnas" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Tipo" @@ -164,7 +137,7 @@ msgstr "Tipo" msgid "Null" msgstr "Nulo" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -188,24 +161,18 @@ msgstr "Enlaces a" msgid "Comments" msgstr "Comentarios" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "No" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -214,15 +181,9 @@ msgstr "No" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -241,141 +202,133 @@ msgstr "Ver el volcado esquema de la base de datos" msgid "No tables found in database." msgstr "No se han encontrado tablas en la base de datos." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Seleccionar todo" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Deseleccionar todo" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "¡El nombre de la base de datos está vacío!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "La base de datos %s ha sido cambiada de nombre a %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "La base de datos %s ha sido copiada a %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Cambiar el nombre de la base de datos a" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Comando" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "y luego" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Copiar la base de datos a" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Únicamente la estructura " -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Estructura y datos" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Solamente datos" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREAR BASE DE DATOS antes de copiar" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Añada %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Añadir el valor AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Añadir restricciones" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Seleccionar la base de datos copiada" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "Repositorio BLOB" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Estado actual" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Habilitado" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Deshabilite" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Dañado" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair" msgctxt "BLOB repository" msgid "Repair" msgstr "Repare" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Deshabilitado" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Habilite" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Cotejamiento" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -384,14 +337,14 @@ msgstr "" "Las opciones adicionales para trabajar con tablas vinculadas fueron " "desactivadas. Para saber porqué, dé clic %saquí%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Editar las páginas PDF" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -400,11 +353,7 @@ msgstr "Tabla" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Filas" @@ -412,42 +361,30 @@ msgstr "Filas" msgid "Size" msgstr "Tamaño" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "en uso" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Creación" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Última actualización" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Última revisión" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -508,11 +445,7 @@ msgstr "Borrar" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "O" @@ -546,85 +479,85 @@ msgstr "Usar tablas" msgid "SQL query on database %s:" msgstr "Consulta a la base de datos %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Ejecutar la consulta" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Acceso denegado " -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "al menos una de estas palabras" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "Todas las palabras" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "La frase exacta" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "como expresión regular" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Resultados de la búsqueda por \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s resultado(s) en la tabla %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Examinar" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Borrar" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Total: %s resultado(s)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Buscar en la base de datos" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Palabra(s) o valor(es) a buscar (comodín: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Encontrado:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Palabras separadas por un espacio (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "En la(s) tabla(s):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -632,36 +565,36 @@ msgstr "Dentro del campo:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Insertar" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Estructura" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Eliminar" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Vaciar" @@ -671,25 +604,25 @@ msgstr "Vaciar" msgid "Table %s has been emptied" msgstr "Se ha vaciado la tabla %s" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Se descartó el modo de visualización %s" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Se ha eliminado la tabla %s" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -698,93 +631,87 @@ msgstr "" "Esta vista tiene al menos este número de filas. Por favor, refiérase a la %" "sdocumentation%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Visualizar" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replicación" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Número de filas" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "" "%s es el motor de almacenamiento predeterminado en este servidor MySQL." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Para los elementos que están marcados:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Marcar todos/as" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Desmarcar todos" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Marcar las tablas con residuo a depurar" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Vista de impresión" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Revisar la tabla" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimizar la tabla" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Reparar la tabla" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analizar la tabla" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Exportar" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Diccionario de datos" @@ -796,10 +723,10 @@ msgstr "Saltarse las tablas bloqueadas" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -821,8 +748,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Acción" @@ -859,8 +786,8 @@ msgstr "Únicamente la estructura " msgid "Untracked tables" msgstr "Saltarse las tablas bloqueadas" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Revisar la tabla" @@ -947,7 +874,7 @@ msgstr "El favorito ha sido borrado." msgid "Showing bookmark" msgstr "Mostrando el favorito" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "El favorito %s fue creado" @@ -1033,295 +960,187 @@ msgstr "¡¡El nombre del servidor está vacío!!" msgid "The user name is empty!" msgstr "¡El nombre de usuario está vacío!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "¡La contraseña está vacía!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "¡Las contraseñas no coinciden!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Agregar un nuevo usuario" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Crear relación" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Cargar los privilegios nuevamente" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Eliminar a los usuarios seleccionados" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Cancelar" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Cargar" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Procesos" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Cambiar el nombre de la base de datos a" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Base de datos" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Copiar la base de datos a" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Juego de caracteres" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "La tabla debe tener al menos un campo." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Crear tabla" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Buscar" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Se han guardado las modificaciones" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "La relación fue eliminada" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "Se añadió una relación FOREIGN KEY" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Se añadió la relación interna" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Error: no se añadió la relación." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Error: la relación ya existe." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Error guardando las coordenadas para el Diseñador." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Opciones de relación general" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Deshabilitado" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Seleccione la llave de referencia" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Seleccione la llave extranjera (foreign key)" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Por favor, seleccione la clave primaria o una clave única" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Elegir el campo a mostrar" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "Donate" msgid "Done" msgstr "Donación" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Previo" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Próxima" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Total" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr " Binario " -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Mar" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Abr" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "May" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Jun" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Jul" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Ago" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Oct" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Ene" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Feb" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Abr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1329,178 +1148,178 @@ msgid "May" msgstr "May" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Jun" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Jul" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Ago" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Sep" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Oct" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Nov" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Dic" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Dom" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Lun" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Mar" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Vie" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Dom" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Lun" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Mar" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Mie" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Jue" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Vie" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sab" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Dom" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Lun" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Mar" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Mie" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Jue" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Vie" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Sab" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "Wiki" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "en uso" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1561,7 +1380,7 @@ msgstr "Índices" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Único" @@ -1579,7 +1398,7 @@ msgid "Comment" msgstr "Comentario" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1604,8 +1423,8 @@ msgstr "" "Los índices %1$s y %2$s parecen ser iguales y posiblemente se puede remover " "uno." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Bases de datos" @@ -1784,11 +1603,7 @@ msgstr "Contraseña:" msgid "Server Choice" msgstr "Elección del servidor" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Las \"cookies\" deben estar habilitadas." @@ -1872,11 +1687,7 @@ msgstr "" "No se puede utilizar iconv ni libiconv ni la función recode_string mientras " "se carga la extensión de informes. Comprueba la configuración de php." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Si recibe una página en blanco, todo está correcto." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "No fue posible cargar la configuración predeterminada desde: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1914,50 +1717,30 @@ msgstr "" "El contenido de $cfg['PmaAbsoluteUri'] ¡DEBE constar en config.inc." "php!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "No es válido el índice del servidor: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" "El nombre del host no es válido para el servidor %1$s. Por favor, revise su " "configuración." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Servidor" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "El método de autenticación no es válido en la configuración actual:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "El método de autenticación no es válido en la configuración actual:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Usted debería actualizar su %s a la versión %s o más reciente." @@ -1983,7 +1766,7 @@ msgstr "es" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Documentación" @@ -1997,138 +1780,138 @@ msgstr "consulta SQL" msgid "MySQL said: " msgstr "MySQL ha dicho: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Explicar el SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Salir de la explicación del SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "Sin código PHP" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Crear código PHP" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Actualizar" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Salir de la validación del SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Validar el SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Motores" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Perfil/Perfilamiento" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Tiempo" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Bytes" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d-%m-%Y a las %H:%M:%S" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s días, %s horas, %s minutos y %s segundos" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Empezar" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Previo" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Fin" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Saltar a la base de datos "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "La funcionalidad %s está afectada por un fallo conocido, vea %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2149,7 +1932,7 @@ msgid "Events" msgstr "Eventos" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Nombre" @@ -2177,15 +1960,15 @@ msgstr "Generar una consulta" msgid "Designer" msgstr "Diseñador" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Importar" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privilegios" @@ -2204,11 +1987,7 @@ msgid "" msgstr "Podría ser aproximado. Léase la FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Residuo a depurar" @@ -2228,7 +2007,7 @@ msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" "(o el socket del servidor MySQL local no está configurado correctamente)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Detalles..." @@ -2238,36 +2017,22 @@ msgid "Change password" msgstr "Cambio de contraseña" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Sin contraseña" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Contraseña" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Debe volver a escribir" @@ -2282,20 +2047,12 @@ msgid "MySQL 4.0 compatible" msgstr "Compatible con MySQL 4.0" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Generar la contraseña" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Generar" @@ -2308,17 +2065,23 @@ msgstr "Crear nueva base de datos" msgid "Create" msgstr "Crear" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Sin privilegios" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "La tabla debe tener al menos un campo." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Crear nueva tabla en la base de datos %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2386,11 +2149,7 @@ msgid "remember template" msgstr "recordar la plantilla" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Juego de caracteres del archivo:" @@ -2401,7 +2160,7 @@ msgstr "Compresión" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Ninguna" @@ -2443,11 +2202,7 @@ msgstr "" msgid "File to import" msgstr "Archivo a importar" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Localización del archivo de texto" @@ -2455,21 +2210,13 @@ msgstr "Localización del archivo de texto" msgid "File uploads are not allowed on this server." msgstr "No está permitido subir archivos a este servidor." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "" "No está disponible el directorio que usted habilitó para subir las tareas" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "directorio en el servidor web para subir los archivos" @@ -2608,11 +2355,7 @@ msgstr "Organizar según la clave" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Opciones" @@ -2682,14 +2425,14 @@ msgstr "Mostrando registros " msgid "total" msgstr "total" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "La consulta tardó %01.4f seg" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Cambiar" @@ -2761,11 +2504,7 @@ msgstr "Total de memoria del búfer consumido" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Total" @@ -3061,11 +2800,7 @@ msgstr "" "reciben el siguiente número más alto." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Formato" @@ -3137,13 +2872,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Datos" @@ -3192,15 +2922,9 @@ msgstr "MIME-type" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Servidor" @@ -3401,7 +3125,7 @@ msgstr "Exportar las opciones predeterminadas" msgid "Open new phpMyAdmin window" msgstr "Abrir nueva ventana de phpMyAdmin" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "No existen tablas" @@ -3414,7 +3138,7 @@ msgstr "Resultado SQL" msgid "Generated by" msgstr "Generado por" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL ha devuelto un valor vacío (i.e., cero columnas)." @@ -3565,20 +3289,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primaria" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Índice" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Texto completo" @@ -3803,6 +3527,10 @@ msgstr "Este formato no tiene opciones" msgid "not OK" msgstr "no recibió el OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Habilitado" @@ -3826,7 +3554,7 @@ msgstr "" "Para actualizar su tabla Columna_comentarios (Column_comments), por favor " "revise la documentación" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Consulta guardada en favoritos" @@ -3878,13 +3606,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Nombre de usuario" @@ -3904,22 +3627,14 @@ msgstr "Mostrar el estado del esclavo" msgid "Slave status" msgstr "Mostrar el estado del esclavo" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Variable" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Valor" @@ -3937,40 +3652,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Cualquier usuario" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Use el campo de texto" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Cualquier servidor" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Local" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Este Host" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Usar la tabla Anfitrión (Host)" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3994,7 +3680,6 @@ msgid "Use Host Table" msgstr "Usar la tabla Anfitrión (Host)" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -4028,29 +3713,29 @@ msgstr "Idioma desconocido: %1$s." msgid "Servers" msgstr "Servidores" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Variables" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Juegos de caracteres" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Motores" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Log binario" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Procesos" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -4080,51 +3765,51 @@ msgstr "" msgid "Target database" msgstr "Buscar en la base de datos" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Ejecute la o las consultas SQL en el servidor %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Ejecutar la(s) consulta(s) SQL en la base de datos %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Nombre de las columnas" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Guardar esta consulta en favoritos" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Permitir que todo usuario pueda acceder a este favorito" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Reemplazar el favorito existente que tenga el mismo nombre" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "No sobreescribir esta consulta desde fuera de la ventana" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Delimitador" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Mostrar esta consulta otra vez " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Enviar" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Solamente ver" @@ -4305,13 +3990,13 @@ msgstr "definición de la PARTICIÓN" msgid "Save" msgstr "Grabar" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "Añadir %s campo(s)" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4528,8 +4213,8 @@ msgstr "Reiniciar" msgid "Protocol version" msgstr "Versión del protocolo" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Usuario" @@ -4988,116 +4673,116 @@ msgstr "Motores de almacenamiento" msgid "View dump (schema) of databases" msgstr "Ver el volcado (schema) de la base de datos" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Incluye todos los privilegios excepto GRANT (CONCEDER)." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Permite alterar la estructura de las tablas existentes." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Permite alterar y eliminar las rutinas almacenadas." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Permite crear nuevas bases de datos y tablas." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Permite crear el almacenamiento de rutinas." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Permite la creación de tablas nuevas." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Permite la creación de tablas temporales." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Permite crear, eliminar y cambiar el nombre de las cuentas de usuario." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Permite crear nuevas vistas." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Permite borrar datos." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Permite eliminar bases de datos y tablas." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Permite eliminar tablas." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Permite organizar los eventos para el gestor de eventos" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Permite ejecutar las rutinas almacenadas." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Permite importar y exportar datos de y hacia archivos." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Permite añadir usuarios y privilegios sin conectarse nuevamente a la tabla " "de privilegios." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Permite crear y eliminar índices." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Permite insertar y reemplazar datos." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Permite poner candados a las tablas para el proceso actual." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Limita el número de conexiones nuevas que el usuario puede abrir por hora." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Limita el número de consultas que el usuario puede enviar al servidor por " "hora." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5105,63 +4790,63 @@ msgstr "" "Limita el número de comandos que cambian cualquier tabla o base de datos que " "el usuario puede ejecutar por hora." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Limita el número de conexiones simultáneas que el usuario pueda tener." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Permite ver los procesos de todos los usuarios" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "No tiene efecto en esta versión de MySQL." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Permite volver a cargar los parámetros del servidor y depurar los cachés del " "servidor." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" "Da el derecho al usuario para preguntar dónde están los \"esclavos / masters" "\"." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Necesario para los \"esclavos\" de replicación." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Permite leer los datos." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Concede acceso a la lista completa de bases de datos." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" "Permite llevar a cabo las consultas SHOW CREATE VIEW (MOSTRAR CREAR VER)." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Permite desconectar el servidor." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5172,161 +4857,161 @@ msgstr "" "tales como montar parámetros de variables globales o matar procesos de otros " "usuarios." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Permite crear y eliminar un evento desencadenante" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Permite cambiar los datos." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Sin privilegios." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Ninguna" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Privilegios específicos para la tabla" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr "" " Nota: Los nombres de los privilegios de MySQL están expresados en inglés " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Privilegios globales" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Privilegios específicos para la base de datos" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administración" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Límites de recursos" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" "Nota: si cambia los parámetros de estas opciones a 0 (cero), remueve el " "límite." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Información de la cuenta" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "No cambiar la contraseña" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Usuario(s) no encontrado(s)." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "¡El usuario %s ya existe!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Ha agregado un nuevo usuario." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Ha actualizado los privilegios para %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Ha revocado los privilegios para %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "La contraseña para %s se cambió exitosamente." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Borrando %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "¡No se han seleccionado usuarios para eliminar!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Cargando los privilegios nuevamente" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Los usuarios seleccionados fueron borrados exitosamente." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Los privilegios fueron cargados nuevamente de manera exitosa." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Editar los privilegios" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Revocar" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Vista global de usuarios" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Conceder" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "cualquiera" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Agregar un nuevo usuario" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Eliminar a los usuarios seleccionados" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Revocar todos los privilegios activos de los usuarios y borrarlos después." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "" "Eliminar las bases de datos que tienen los mismos nombres que los usuarios." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5340,50 +5025,50 @@ msgstr "" "manuales en él. En este caso, nuevamente deberá %scargar la página de " "privilegios%s antes de continuar." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "El usuario que seleccionó no se halló en la tabla de privilegios." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Privilegios específicos para la columna" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Añadir privilegios a esta base de datos" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Los comodines _ y % deben acompañarse de \\ para usarlos de manera literal" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Añadir privilegios a esta tabla" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Cambiar la información de la cuenta / Copiar el usuario" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Crear un nuevo usuario con los mismos privilegios y..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "...mantener el anterior." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ...borrar el viejo de las tablas de usuario." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ...revocar todos los privilegios activos del viejo y eliminarlo después." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5391,46 +5076,46 @@ msgstr "" " ...borrar el viejo de las tablas de usuario y luego volver a cargar los " "privilegios." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Base de datos para el usuario" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Ninguna" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" "Crear base de datos con el mismo nombre y otorgue todos los privilegios" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" "Otorgue todos los privilegios al nombre que contiene comodín (username\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "Revisar los privilegios para la base de datos "%s"." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Usuarios con acceso a "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "global" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "específico para la base de datos" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "comodín" @@ -8359,25 +8044,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "La Id de la fila insertada es: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Mostrar como código PHP" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Mostrando la consulta SQL" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Problemas con los índices de la tabla `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Etiqueta" @@ -8430,13 +8115,6 @@ msgstr "" msgid "Show insert query" msgstr "Mostrando la consulta SQL" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "y luego" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Volver" @@ -8519,7 +8197,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Añadir al índice  %s columna(s)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "El número de columnas debe ser superior a cero." @@ -8633,41 +8311,6 @@ msgstr "Comprobar la integridad referencial:" msgid "Show tables" msgstr "Mostrar las tablas" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Espacio utilizado" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Uso" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Efectivo/a" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Estadísticas de la fila" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Enunciado" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinámico/a" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Longitud de la fila" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Espacio utilizado" @@ -8701,7 +8344,6 @@ msgid "Row length" msgstr "Longitud de la fila" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Tamaño de la fila " @@ -8779,50 +8421,50 @@ msgstr "Ninguna" msgid "Column %s has been dropped" msgstr "Se ha eliminado la tabla %s" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Se añadió una clave primaria en %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Se añadió un índice en %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Vista de relaciones" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Planteamiento de la estructura de tabla" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "Añadir %s campo(s)" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Al final de la tabla" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Al comienzo de la tabla" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Después de %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Crear un índice en %s columna(s)" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "particionado" @@ -8864,6 +8506,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -9288,6 +8934,9 @@ msgstr "Cambiar el nombre de la tabla a" #~ msgid "Process list" #~ msgstr "Lista de procesos" +#~ msgid "Reload privileges" +#~ msgstr "Cargar los privilegios nuevamente" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/et.po b/po/et.po old mode 100755 new mode 100644 index e39ded23a..631dbbd7a --- a/po/et.po +++ b/po/et.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: estonian \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Näita kõiki" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Otsi" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Mine" @@ -113,7 +93,7 @@ msgstr "Kasuta seda väärtust" msgid "Database %1$s has been created." msgstr "Andmebaas %s kustutatud." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Andmebaasi kommentaar: " @@ -140,17 +120,10 @@ msgstr "Väljade nimed" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Tüüp" @@ -163,7 +136,7 @@ msgstr "Tüüp" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -187,24 +160,18 @@ msgstr "Lingib " msgid "Comments" msgstr "Kommentaarid" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Ei" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -213,15 +180,9 @@ msgstr "Ei" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -240,142 +201,134 @@ msgstr "Vaata andmebaasi väljundit (skeemi)" msgid "No tables found in database." msgstr "Andmebaasist ei leitud tabeleid." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Märgista kõik" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Puhasta kõik" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Andmebaasi nimi on tühi!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Andmebaas %s on ümber nimetatud %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Andmebaas %s on kopeeritud %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Nimeta andmebaas ümber" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Käsk" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "ja siis" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Kopeeri andmebaas" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Ainult struktuur" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Struktuur ja andmed" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Ainult andmed" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREATE DATABASE enne kopeerimist" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Lisa %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Lisa AUTO_INCREMENT väärtus" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Lisa piirangud" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Mine kopeeritud andmebaasile" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Staatus" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Lubatud" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "Keelatud" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "Paranda tabelit" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Keelatud" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "Lubatud" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Määrang" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -384,14 +337,14 @@ msgstr "" "Lisavõimalused töötamiseks lingitud tabelitega on deaktiveeritud. Et lugeda " "miks see nii on, vajutage %ssiia%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Muuda PDF lehti" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -400,11 +353,7 @@ msgstr "Tabel" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Ridu" @@ -412,42 +361,30 @@ msgstr "Ridu" msgid "Size" msgstr "Suurus" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "kasutusel" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Loodud" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Viimane muudatus" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Viimane vaatamine" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -508,11 +445,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "või" @@ -546,85 +479,85 @@ msgstr "Kasuta tabeleid" msgid "SQL query on database %s:" msgstr "SQL-päring andmebaasist %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Lae päring" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Ligipääs keelatud" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "vähemalt üks sõnadest" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "kõik sõnadest" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "täpne fraas" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "regulaaravaldisena" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Otsingu tulemused \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s vaste(t) tabelis %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Vaata" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Kustuta" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Kokku: %s vaste(t)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Otsi andmebaasist" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Sõna(d) või väärtus(ed) otsinguks (lühend: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Leia:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Sõnad on eraldatud tühikuga (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Otsi tabeli(te)st:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -632,36 +565,36 @@ msgstr "Otsi tabeli(te)st:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Lisa" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Struktuur" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Kustuta" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Tühjenda" @@ -671,117 +604,111 @@ msgstr "Tühjenda" msgid "Table %s has been emptied" msgstr "Tabel %s tühjendatud" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Vaade %s on kustutatud" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Tabel %s kustutatud" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Vaade" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Tiražeerimine" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Summa" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s on vaikimisi varundusmootor sellele MySQL serverile." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Valitud:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Märgista kõik" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Puhasta kõik" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Kontrolli ülekulusid" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Trükivaade" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Kontrolli tabelit" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimiseeri tabelit" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Paranda tabelit" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analüüsi tabelit" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Ekspordi" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Andmesõnastik" @@ -793,10 +720,10 @@ msgstr "Kontrolli tabelit" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -818,8 +745,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Tegevus" @@ -856,8 +783,8 @@ msgstr "Ainult struktuur" msgid "Untracked tables" msgstr "Kontrolli tabelit" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Kontrolli tabelit" @@ -941,7 +868,7 @@ msgstr "Järjehodja kustutati." msgid "Showing bookmark" msgstr "Näitan järjehoidjat" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Järjehoidja %s loodud" @@ -1025,293 +952,186 @@ msgstr "Masin on tühi!" msgid "The user name is empty!" msgstr "Kasutajanimi on tühi!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Parool on tühi!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Paroolid ei ühti!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Lisa uus kasutaja" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Suhte loomine (relation)" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Lae privileegid uuesti" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Eemalda valitud kasutajad" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Katkesta" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Lokaalne" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Protsessid" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "Korras" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Nimeta andmebaas ümber" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Andmebaas" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Kopeeri andmebaas" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Tähetabel" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Tabelil peab olema vähemalt üks väli." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Loo tabel" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Otsi" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Muutused salvestatud" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Suhe kustutatud" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Sisemine suhe loodud" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Peamised seoste võimalused" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Keelatud" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Vali eelistus võti (referenced key)" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Vali võõrvõti(Foreign Key)" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Palun vali primaarne või unkaalne võti" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Vali väli mida kuvada" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy msgid "Done" msgstr "Andmed" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Eelmine" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Järgmine" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Kokku" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Binaarne" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Mär" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Apr" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Mai" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Jun" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Jul" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Aug" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Okt" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Jan" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Veb" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mär" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Apr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1319,176 +1139,176 @@ msgid "May" msgstr "Mai" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Jun" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Jul" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Aug" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Sep" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Okt" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Nov" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Det" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Püh" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Esm" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Tei" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Ree" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Püh" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Esm" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Tei" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Kol" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Nel" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Ree" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Lau" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Püh" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Esm" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Tei" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Kol" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Nel" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Ree" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Lau" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "kasutusel" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1546,7 +1366,7 @@ msgstr "Indeksid" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unikaalne" @@ -1565,7 +1385,7 @@ msgid "Comment" msgstr "Kommentaarid" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1588,8 +1408,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Andmebaasid" @@ -1759,11 +1579,7 @@ msgstr "Parool:" msgid "Server Choice" msgstr "Serveri valik" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Küpsised(cookies) peavad alates sellest momendist lubatud olema." @@ -1843,11 +1659,7 @@ msgstr "" "Ei suuda kasutada iconv-d või libiconvi või recode_string funktsiooni kuigi " "moodul on installitud Kontrollige oma PHP konfiguratsiooni." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Kui Teile kuvatakse tühi leht on " "kõik korras." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Pole võimalik laadida vaikimisi seadete faili: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1885,48 +1689,28 @@ msgstr "" "$cfg['PmaAbsoluteUri'] konstant peab teie konfiguratsioonifailis " "määratud olema!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Vigane serveri indeks: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "Vigane hostname serverile %1$s. Palun kontrolli seadeid." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Server" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Vigane autoriseerimise meetod konfiguratsioonifailis:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Vigane autoriseerimise meetod konfiguratsioonifailis:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Te peaksite uuendama %s -i versioonini %s või uuemaks." @@ -1954,7 +1738,7 @@ msgstr "Saadetud" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentatsioon" @@ -1968,138 +1752,138 @@ msgstr "SQL-päring" msgid "MySQL said: " msgstr "MySQL ütles: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Seleta SQL-i" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Jäta SQL-i seletamine vahele" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "ilma PHP koodita" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Loo PHP kood" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Uuenda" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Jäta SQL-i kontroll vahele" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Kontrolli SQL-i" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Mootor" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Aeg" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Baiti" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d.%m.%Y kell %H:%M:%S" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s päeva, %s tundi, %s minutit ja %s sekundit" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Algus" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Eelmine" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Lõpp" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Hüppa andmebaasile "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "See %s funktionaalsus on mõjutatud tuntud viga, vaata %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2120,7 +1904,7 @@ msgid "Events" msgstr "Saadetud" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Nimi" @@ -2148,15 +1932,15 @@ msgstr "Päring näite järgi" msgid "Designer" msgstr "Kujundaja" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Import" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privileegid" @@ -2175,11 +1959,7 @@ msgid "" msgstr "Võib olla umbkaudne. Vaadake FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Ülejääv" @@ -2196,7 +1976,7 @@ msgstr "Server ei vasta" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(või kohaliku MySQL serveri soketid ei ole korrektselt seadistatud)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2206,36 +1986,22 @@ msgid "Change password" msgstr "Muuda parooli" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Ilma paroolita" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Parool" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Sisesta uuesti" @@ -2250,20 +2016,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0-iga ühilduv" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Genereeri parool" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Genereeri" @@ -2276,17 +2034,23 @@ msgstr "Loo uus andmebaas" msgid "Create" msgstr "Loo" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Ei oma ühtegi privileegi" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Tabelil peab olema vähemalt üks väli." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Loo uus tabel andmebaasi %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2351,11 +2115,7 @@ msgid "remember template" msgstr "jäta template meelde" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Faili tähetabel:" @@ -2366,7 +2126,7 @@ msgstr "Pakkimine" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Pole" @@ -2408,11 +2168,7 @@ msgstr "" msgid "File to import" msgstr "Imporditav Fail" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "tekstifaili asukoht" @@ -2420,20 +2176,12 @@ msgstr "tekstifaili asukoht" msgid "File uploads are not allowed on this server." msgstr "Faile pole lubatud laadida sellesse serverisse." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Kataloog mille Te üleslaadimiseks sättisite ei ole ligipääsetav" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "webiserveri üleslaadimiskataloogi" @@ -2567,11 +2315,7 @@ msgstr "Sorteeri võtme järgi" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "Tegevused" @@ -2643,14 +2387,14 @@ msgstr "Näita ridu" msgid "total" msgstr "kokku" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Päring kestis %01.4f sek" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Muuda" @@ -2720,11 +2464,7 @@ msgstr "Puhverdusala kasutamine" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Kokku" @@ -2985,11 +2725,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Formaat" @@ -3061,13 +2797,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Andmed" @@ -3116,15 +2847,9 @@ msgstr "MIME-tüüp" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Masin" @@ -3323,7 +3048,7 @@ msgstr "Ekspordi tüüp" msgid "Open new phpMyAdmin window" msgstr "Ava uus phpMyAdmin aken" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Pole tabeleid" @@ -3336,7 +3061,7 @@ msgstr "SQL tulemus" msgid "Generated by" msgstr "Genereerija " -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL tagastas tühja tulemuse (s.t. null rida)." @@ -3486,20 +3211,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primaarne" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Indeks" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Täistekst" @@ -3724,6 +3449,10 @@ msgstr "Sellel formaadil pole seadeid" msgid "not OK" msgstr "Ei ole korras" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "Korras" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Lubatud" @@ -3745,7 +3474,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "Please see Documentation on how to update your Column_comments Table" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Järjehodjaga SQL päring" @@ -3796,13 +3525,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Kasutajanimi" @@ -3822,22 +3546,14 @@ msgstr "Näita alluvate(slave) staatust" msgid "Slave status" msgstr "Näita alluvate(slave) staatust" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Muutuja" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Väärtus" @@ -3855,40 +3571,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Kõik kasutajad" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Kasutage tekstivälja" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Kõik masinad" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Lokaalne" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Antud host" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Kasuta host tabelit" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3912,7 +3599,6 @@ msgid "Use Host Table" msgstr "Kasuta host tabelit" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3946,29 +3632,29 @@ msgstr "Tundmatu keel: %1$s." msgid "Servers" msgstr "Serverid" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Muutujad" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Tähetabelid" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Mootor" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Binaarne logi" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Protsessid" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3997,51 +3683,51 @@ msgstr "" msgid "Target database" msgstr "Otsi andmebaasist" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Käivita SQL käsk/käsud Masinas %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Päri SQL päring(uid) andmebaasist %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Väljade nimed" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Lisa see SQL päring järjehoidjasse" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Anna kõikidele kasutajatele juurdepääs sellele järjehodjale" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Kirjuta samanimeline järjehoidja üle" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Antud päringut mitte muuta väljaspool akent." -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Eraldaja" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Näita päringut siin uuesti " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Vali" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Vaata ainult" @@ -4220,13 +3906,13 @@ msgstr "" msgid "Save" msgstr "Salvesta" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "Lisa %s väli(jad)" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4440,8 +4126,8 @@ msgstr "Tühista" msgid "Protocol version" msgstr "Protokolli versioon" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Kasutaja" @@ -4881,113 +4567,113 @@ msgstr "Varundusmootorid" msgid "View dump (schema) of databases" msgstr "Näita andmebaaside sisu (skeemi)" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Sisaldab kõiki privileege peale GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Lubab muuta olemasolevate tabelite struktuure." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Lubabu salvestatud rutiinide muutmise ja kustutamise." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Lubab luua uusi andmebaase ja tabeleid." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Lubab salvestatud rutiinide loomise." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Lubab luua uusi tabeleid." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Lubab luua ajutisi tabeleid." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Lubab kasutajakontode loomise, kustutamise ja muutmise." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Lubab uute vaadete loomist." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Lubab kustutada infot." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Lubab kustuada andmebaase ja tabeleid." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Lubab kustutada tabeleid.." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Lubab salvestatud rutiinide käivituse." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Lubab andmete eksportimist faili ja andmete importimist failidest." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Lubab lisada kasutajaid ja privileege ilma privileges tabelit " "taaskäivitamata." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Lubab luua ja kustutada indekseid." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Lubab lisada ja muuta infot." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Lubab lukustada tabeleid aktiivse päringu tarbeks." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Limiteerib ühenduste arvu tunnis kasutaja jaoks." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Limiteerib päringute arvu tunnis kasutaja jaoks." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4995,58 +4681,58 @@ msgstr "" "Limiteerib käskude, mis muudavad suvalist tabelit või andmebaasi, arvu " "tunnis kasutaja jaoks" -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Piirab ühenduste arvu mida kasutajal võib korraga olla." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Ei oma antud MySQL versioonis mingit effekti." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "Lubab taaslaadida serveri seadmeid ja puhastada serveri cachet." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Lubab kasutajal küsida kus on slaved/masterid." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Vajalik slavede paljundamiseks." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Lubab lugeda infot." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Annab ligipääsu kogu andmebaasilistingule." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Lubab SHOW CREATE VIEW päringute käivitamise." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Lubab serverit maha lasta." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5056,158 +4742,158 @@ msgstr "" "enamike administratiivsete operatsioonide jaoks, nagu globaalsete muutujate " "seadmine või teiste kasutajate ühenduste tapmine." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "Lubab luua ja kustutada indekseid." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Lubab muuta infot." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Mitte ühtegi privileegi." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Pole" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Tabel-spetsiifilised privileegid" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Märkus: MySQL privileegide nimed on ingliskeelsed " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Globaalsed privileegid" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Andmebaas-spetsiifilised privileegid" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administreerimine" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Ressursilimiidid" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Märkus: Märkides antud seaded 0 (null), eemaldate limiidi." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Logimise informatsioon" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Ärge muutke parooli" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Ei leitud ühtegi kasutajat." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Kasutaja %s on juba olemas!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Te lisasite uue kasutaja." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Te uuendasite privileege %s-l." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Te võtsite tagasi privileegid %s-lt" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Kasutaja %s parool vahetati õnnestunult." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Kustutan %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Ühtegi kasutajat pole valitud kustutamiseks!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Taaslaen privileege" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Valitud kasutajad on õnnestunult kustutatud." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Privileegid taaslaeti edukalt." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Muuda privileege" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Võta tagasi" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Kasutaja ülevaade" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Õigused" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "kõik" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Lisa uus kasutaja" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Eemalda valitud kasutajad" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Eemalda kõik aktiivsed privileegid kasutajatelt ning kustuta nad pärast seda." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Kustuta andmebaasid millel on samad nimed nagu kasutajatel." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5220,95 +4906,95 @@ msgstr "" "juhul kui olete käsitsi muudatusi teinud. Sellisel juhul peaksite te " "privileegid %staaslaadima%s enne jätkamist." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Valitud kasutajat ei leitud privileegide tabelist." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Väli-spetsiifilised privileegid" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Lisa privileegid antud andmebaasile" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Metamärgid _ ja % peaksid olema varjestatud märgiga \\, kui soovite neid " "sisestada" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Lisa privileegid antud tabelile" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Vaheta logimisinformatsiooni / Kopeeri kasutaja" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Loo uus kasutaja samade privileegidega ja ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... hoia vana alles." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... kustuta vana kasutajate tabelist." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... kanna kõik aktiivsed privileegid üle vanast ja kustuta see pärast." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" " ... kustuta vana kasutajate tabelist ja taaslae privileegid pärast seda." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Andmebaas kasutajale" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Pole" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Loo sama nimega andmebaas ja anna kõik õigused" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Anna kõik õigused Metanimele (username\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "Kontrolli privileege andmebaasile "%s"." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Kasutajad kellel on ligipääs "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "globaalne" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "andmebaasipõhine" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "metamärk" @@ -8057,25 +7743,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Näitan PHP koodina" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Näitan SQL päringut" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Probleemid tabeli `%s` indeksitega" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Nimetus" @@ -8128,13 +7814,6 @@ msgstr "" msgid "Show insert query" msgstr "Näitan SQL päringut" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "ja siis" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Mine eelmisele lehele tagasi" @@ -8216,7 +7895,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Lisa indeksisse  %s rida/read" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Veergude arv peab olema nullist suurem." @@ -8333,41 +8012,6 @@ msgstr "Kontrolli pärinevust:" msgid "Show tables" msgstr "Näita tabeleid" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Ruumivõtt" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Kasutus" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Efektiivne" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Rea statistika" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Parameerid" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dünaamiline" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Rea pikkus" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Ruumivõtt" @@ -8401,7 +8045,6 @@ msgid "Row length" msgstr "Rea pikkus" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " rea suurus " @@ -8473,50 +8116,50 @@ msgstr "Pole" msgid "Column %s has been dropped" msgstr "Tabel %s kustutatud" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Primaarne võti lisati %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Indeks lisati %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Pärinevuse vaade" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Soovita tabeli struktuuri" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "Lisa %s väli(jad)" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Tabeli lõppu" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Tabeli algusesse" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Peale %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Loo indeks  %s väljadest" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8558,6 +8201,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8953,6 +8600,9 @@ msgstr "Nimeta tabel ümber" #~ msgid "Process list" #~ msgstr "Protsessinimekiri" +#~ msgid "Reload privileges" +#~ msgstr "Lae privileegid uuesti" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/eu.po b/po/eu.po old mode 100755 new mode 100644 index b95e53f4e..811a61841 --- a/po/eu.po +++ b/po/eu.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-31 10:40+0200\n" "Last-Translator: \n" "Language-Team: basque \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Dena erakutsi" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Bilatu" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Joan" @@ -114,7 +94,7 @@ msgstr "Erabili balio hau" msgid "Database %1$s has been created." msgstr "%s datu-basea ezabatua izan da." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Datu-basearen iruzkina: " @@ -141,17 +121,10 @@ msgstr "Zutabe izenak" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Mota" @@ -164,7 +137,7 @@ msgstr "Mota" msgid "Null" msgstr "Nulua" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -188,24 +161,18 @@ msgstr "Estekak honi:" msgid "Comments" msgstr "Iruzkinak" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Ez" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -214,15 +181,9 @@ msgstr "Ez" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -241,146 +202,138 @@ msgstr "Ikusi datu-basearen iraulketa (eskema)" msgid "No tables found in database." msgstr "Ez da taularik aurkitu datu-basean." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Dena hautatu" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Desautatu dena" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 #, fuzzy msgid "The database name is empty!" msgstr "Taularen izena hutsik dago!" -#: db_operations.php:241 +#: db_operations.php:236 #, fuzzy, php-format msgid "Database %s has been renamed to %s" msgstr "%s taula %s-(e)ra berrizendatua izan da" -#: db_operations.php:245 +#: db_operations.php:240 #, fuzzy, php-format msgid "Database %s has been copied to %s" msgstr "%s taula hona kopiatua izan da: %s." -#: db_operations.php:423 +#: db_operations.php:412 #, fuzzy msgid "Rename database to" msgstr "Taula berrizendatu izen honetara: " -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Komandoa" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "eta orduan" #: db_operations.php:455 ->>>>>>> origin/master #, fuzzy msgid "Copy database to" msgstr "Datu-baserik ez" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Egitura soilik" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Egitura eta datuak" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Datuak soilik" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "%s gehitu" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Gehitu AUTO_INCREMENT balioa" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Murrizketak gehitu" -#: db_operations.php:507 +#: db_operations.php:496 #, fuzzy msgid "Switch to copied database" msgstr "Kopiatutako taulara aldatu" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Egoera" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Gaituta" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "Ezgaituta" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "Taula konpondu" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Ezgaituta" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "Gaituta" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Ordenamendua" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -389,14 +342,14 @@ msgstr "" "Estekatutako taulekin lan egiteko hobespen gehigarriak ezgaitu dira . " "Zergatia jakiteko egizu klik %shemen%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Editatu PDF Orriak" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -405,11 +358,7 @@ msgstr "Taula" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Errenkadak" @@ -417,42 +366,30 @@ msgstr "Errenkadak" msgid "Size" msgstr "Tamaina" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "lanean" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Sortzea" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Azken eguneraketa" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Azken egiaztapena" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -513,11 +450,7 @@ msgstr "Ezabatu" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Edo" @@ -551,85 +484,85 @@ msgstr "Taulak erabili" msgid "SQL query on database %s:" msgstr "SQL-kontsulta %s datu-basean:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Kontsulta bidali" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Sarbidea ukatua" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "hitz hauetariko bat gutxienez" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "hitz guztiak" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "esaldi zehatza" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "adierazpen erregular moduan" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Bilaketaren emaitzak: \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s emaitza(k) %s taulan" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Arakatu" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Ezabatu" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Guztira: %s emaitza(k)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Datu-basean bilatu" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Bilaketa egiteko hitza(k) edo balioa(k) (komodina: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Aurkitu:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Hitzak \"zuriune\" karakterrarekin bereiztuta daude (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Taul(ar)en barnean:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -637,36 +570,36 @@ msgstr "Taul(ar)en barnean:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Txertatu" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Egitura" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Ezabatu" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Hutsik" @@ -676,118 +609,112 @@ msgstr "Hutsik" msgid "Table %s has been emptied" msgstr "%s taula hustu egin da" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, fuzzy, php-format msgid "View %s has been dropped" msgstr "%s eremua ezabatu da" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "%s taula ezabatu egin da" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 #, fuzzy msgid "Replication" msgstr "Erlazioak" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Gehiketa" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "" -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Ikurdunak:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Guztiak egiaztatu" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Desautatu dena" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Arazteko hondakinak egiaztatu" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Inprimatzeko ikuspegia" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Taula egiaztatu" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Taula optimizatu" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Taula konpondu" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Taula aztertu" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Esportatu" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Datu-hiztegia" @@ -798,10 +725,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -822,8 +749,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Ekintza" @@ -859,8 +786,8 @@ msgstr "Egitura soilik" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Taula egiaztatu" @@ -937,7 +864,7 @@ msgstr "Gordetako kontsulta ezabatu da." msgid "Showing bookmark" msgstr "" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "" @@ -1018,292 +945,189 @@ msgstr "Zerbitzariaren izena hutsik dago!" msgid "The user name is empty!" msgstr "Erabiltzailearen izena hutsik dago!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Pasahitza hutsik dago!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Pasahitzek ez dute bat egiten!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Erabiltzaile berria gehitu" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Zerbitzariaren bertsioa" - -#: js/messages.php:48 -#, fuzzy -msgid "Reloading Privileges" -msgstr "Pribilegio orokorrak" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Hautatutako erabiltzaileak baztertu" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Lokal" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Prozesuak" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "Zuzena" - -#: js/messages.php:65 -#, fuzzy -msgid "Renaming Databases" -msgstr "Taula berrizendatu izen honetara: " - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Datu-basea" - -#: js/messages.php:67 -#, fuzzy -msgid "Copying Database" -msgstr "Datu-baserik ez" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Karaktere-jokoa" - -#: js/messages.php:69 -#, fuzzy -#| msgid "You have to choose at least one column to display" -msgid "Table must have atleast 1 column" -msgstr "Gutxienez bistaratzeko Zutabe bat hautatu duzu." - -#: js/messages.php:70 -#, fuzzy -msgid "Create Table" -msgstr "Orri berri bat sortu" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Bilatu" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Aldaketak gorde dira" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 #, fuzzy msgid "Relation deleted" msgstr "Erlazioen ikuspegia" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 #, fuzzy msgid "Internal relation added" msgstr "Barne-erlazioak" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Erlazioen ezaaugarri orokorrak" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Ezgaituta" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Aukeratu erakutsi beharreko eremua" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "Batez" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Aurrekoa" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Hurrengoa" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Gutira" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr " Binarioa " -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Mar" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Api" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Mai" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Eka" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Uzt" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Abu" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Urr" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Urt" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Ots" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Api" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1311,176 +1135,176 @@ msgid "May" msgstr "Mai" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Eka" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Uzt" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Abu" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Ira" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Urr" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Aza" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Abe" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Iga" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Astel" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Astea" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Osti" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Iga" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Astel" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Astea" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Astez" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Oste" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Osti" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Lar" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Iga" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Astel" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Astea" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Astez" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Oste" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Osti" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Lar" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "lanean" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1537,7 +1361,7 @@ msgstr "Indizeak" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Bakarra" @@ -1556,7 +1380,7 @@ msgid "Comment" msgstr "Iruzkinak" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1579,8 +1403,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Datu-baseak" @@ -1746,11 +1570,7 @@ msgstr "Pasahitza:" msgid "Server Choice" msgstr "Zerbitzariaren hautaketa" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Puntu honetarako cookie-ek gaituta egon behar dute." @@ -1830,11 +1650,7 @@ msgstr "" "Ezin dira erabili ez iconv, ez libiconv ezta recode_string funtzioa " "luzapenen txostena kargatzen den bitartean. Berpasatu php-ren konfigurazioa." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Orria txuriz jasoz gero, dena " "ondo legoke." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1872,47 +1680,27 @@ msgstr "" "$cfg['PmaAbsoluteUri'] direktibak zure konfigurazio fitxategian " "zehaztuta behar du egon!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Zerbitzaria" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "%s %s bertsiora edo handiago batera eguneratu beharko zenuke." @@ -1938,7 +1726,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentazioa" @@ -1952,136 +1740,136 @@ msgstr "SQL kontsulta" msgid "MySQL said: " msgstr "MySQL-ek zera dio: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "SQL-a azaldu" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "SQL-ren azalpena saltatu" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "PHP Koderik gabe" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "PHP kodea sortu" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "SQL-ren balidapena saltatu" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "SQL balidatu" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Denbora" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Byte" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%Y-%m-%d, %H:%M:%S" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s egun, %s ordu, %s minutu eta %s segundu" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Hasi" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Aurrekoa" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Amaiera" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr ""%s" datu-basera joan." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2102,7 +1890,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Izena" @@ -2130,16 +1918,16 @@ msgstr "Kontsulta" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 #, fuzzy msgid "Import" msgstr "Esportatu" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Pribilegioak" @@ -2158,11 +1946,7 @@ msgid "" msgstr "" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Arazteko hondakina" @@ -2179,7 +1963,7 @@ msgstr "" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2189,36 +1973,22 @@ msgid "Change password" msgstr "Pasahitza aldatu" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Pasahitzik ez" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Pasahitza" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Berridatzi" @@ -2231,20 +2001,12 @@ msgid "MySQL 4.0 compatible" msgstr "" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master #, fuzzy msgid "Generate" msgstr "Egilea:" @@ -2258,17 +2020,23 @@ msgstr "Datu-base berri bat sortu" msgid "Create" msgstr "Sortu" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Pribilegiorik gabe" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "You have to choose at least one column to display" +msgid "Table must have at least one column." +msgstr "Gutxienez bistaratzeko Zutabe bat hautatu duzu." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Taula berri bat sortu %s datu-basean" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of rows per page" msgid "Number of columns" @@ -2331,11 +2099,7 @@ msgid "remember template" msgstr "txantiloia gogoratu" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Fitxategiaren karaktereen kodeketa:" @@ -2346,7 +2110,7 @@ msgstr "Trinkotzea" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Batez" @@ -2388,11 +2152,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Testu-fitxategiaren kokapena" @@ -2400,20 +2160,12 @@ msgstr "Testu-fitxategiaren kokapena" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Igoerentzat ezarri duzun direktorioa ez dago eskuragarri" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "Fitxategiak igotzeko web-zerbitzariaren direktorioa" @@ -2542,11 +2294,7 @@ msgstr "Gakoaren arabera ordenatu" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "Eragiketak" @@ -2618,14 +2366,14 @@ msgstr "Errenkadak erakusten" msgid "total" msgstr "guztira" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Kontsulta exekutatzeko denbora %01.4f seg" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Aldatu" @@ -2693,11 +2441,7 @@ msgstr "" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Gutira" @@ -2943,11 +2687,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Formatoa" @@ -3019,13 +2759,8 @@ msgstr "" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Datuak" @@ -3075,15 +2810,9 @@ msgstr "MIME-mota" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Zerbitzaria" @@ -3284,7 +3013,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Taularik ez" @@ -3297,7 +3026,7 @@ msgstr "SQL emaitza" msgid "Generated by" msgstr "Egilea:" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL-k emaitza hutsa itzuli du. (i.e. zero errenkada)." @@ -3444,20 +3173,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Lehen mailakoa" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Indizea" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Testu osoa" @@ -3686,6 +3415,10 @@ msgstr "Formato honek ez du aukerarik" msgid "not OK" msgstr "Okerra" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "Zuzena" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Gaituta" @@ -3709,7 +3442,7 @@ msgstr "" "Mesedez, Dokumentazioa begiratu zure zutabeen iruzkinen Taula nola " "eguneratzeko" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Kontsulta gogokoetan gordea" @@ -3760,13 +3493,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Erabiltzaile-izena" @@ -3784,22 +3512,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Aldagaia" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "balioa" @@ -3818,40 +3538,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Edozein erabiltzaile" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Testu-eremua erabili" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Edozein ostalari" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Lokal" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Host hau" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Host taula erabili" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3875,7 +3566,6 @@ msgid "Use Host Table" msgstr "Host taula erabili" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3910,30 +3600,30 @@ msgstr "" msgid "Servers" msgstr "Zerbitzaria" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Aldagaiak" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Karaktere-multzoa" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 #, fuzzy msgid "Binary log" msgstr " Binarioa " -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Prozesuak" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3962,51 +3652,51 @@ msgstr "" msgid "Target database" msgstr "Datu-basean bilatu" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, fuzzy, php-format msgid "Run SQL query/queries on server %s" msgstr "SQL kontsulta(k) exekutatu %s datu-basean" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "SQL kontsulta(k) exekutatu %s datu-basean" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Zutabe izenak" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Kontsulta hau gogokoetan gorde" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Gogokoen erregistro hau edozein erabiltzailearentzat erabilgarri " -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Kontsulta hau ez idatzi gainean leihotik kanpo" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Kontsulta hau hemen berriz erakutsi" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Bidali" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Soilik ikusi" @@ -4186,13 +3876,13 @@ msgstr "" msgid "Save" msgstr "Gorde" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "Gehitu %s zutabe" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to add at least one column." @@ -4378,8 +4068,8 @@ msgstr "Reset egin" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Erabiltzailea" @@ -4816,121 +4506,121 @@ msgstr "" msgid "View dump (schema) of databases" msgstr "Ikusi datu-baseen iraulketa (eskema)" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Pribilegio guztiak, GRANT(baimendu) izanezik, dauzka." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Uneko taulen egiturak aldatzea baimentzen du." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 #, fuzzy msgid "Allows altering and dropping stored routines." msgstr "Indizeak sortu eta ezabatzea baimentzen du." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Datu-base eta taula berriak sortzea baimentzen du." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 #, fuzzy msgid "Allows creating stored routines." msgstr "Taula berriak sortzea baimentzen du." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Taula berriak sortzea baimentzen du." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Aldi baterako taulak sortzea baimentzen du." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 #, fuzzy msgid "Allows creating new views." msgstr "Taula berriak sortzea baimentzen du." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Datuak ezabatzea baimentzen du." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Datu-base eta taulak ezabatzea baimentzen du." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Taulak ezabatzea baimentzen du." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "" "Datuak fitxategietatik inportatzea eta fitxategietara esportatzea baimentzen " "du." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Erabiltzaileak eta pribilegioak gehitzea baimentzen du pribilegioen taula " "berkargatu gabe." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Indizeak sortu eta ezabatzea baimentzen du." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Datuak txertatu eta ordezkatzea baimentzen du." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Momentuko harian taulak blokeatzea baimentzen du." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Erabiltzaileak orduko ireki dezakeen konexio berrien kopurua mugatzen du." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Erabiltzaileak orduko zerbitzarira bidali dezakeen kontsulta kopurua " "mugatzen du." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4938,62 +4628,62 @@ msgstr "" "Erabiltzaileak orduko exekuta dezakeen taula edo datu-baserik alda dezaketen " "komando kopurua mugatzen du." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 #, fuzzy msgid "Limits the number of simultaneous connections the user may have." msgstr "" "Erabiltzaileak orduko ireki dezakeen konexio berrien kopurua mugatzen du." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Ez du eraginik MySQL bertsio honetan." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Zerbitzariaren hobespenak berkargatu eta beraren cacheak hustea baimentzen " "du." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Erabiltzailea baimentzen du morroiak / nagusiak non dauden galdetzeko." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Erreplikazio morroientzat beharrezkoa." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Datuak irakurtzea baimentzen du." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Datu-base zenrrenda osorako sarrera ahalbidetzen du." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Zerbitzaria amatatzea baimentzen du." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5003,158 +4693,158 @@ msgstr "" "Aldagai orokorrak zehaztu edota beste erabiltzaileen hariak hiltzeko " "bezalako kudeaketa-eragiketa gehienentzat beharrezkoa da." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "Indizeak sortu eta ezabatzea baimentzen du." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Datuak aldatzea baimentzen du." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Pribilegiorik ez." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Batez" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Taularen pribilegio espezifikoak" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Oharra: MySQL-ren pribilegioen izenak ingelesez adierazita daude" -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Pribilegio orokorrak" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Datu-basearen pribilegio espezifikoak" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Kudeaketa" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Baliabideen mugak" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Oharra: Aukera hauek zerora ezarriz gero muga kentzen da." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Saioa hasteko informazioa" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Pasahitza ez aldatu" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Ez da erabiltzailerik aurkitu." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "%s erabiltzailea badago lehendik ere!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Erabiltzaile berria gehitu duzu." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "%s-aren pribilegioak eguneratu dituzu." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Zuk %s-(r)en pribilegioak ezeztatu dituzu" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "%s-arentzako pasahitza arrakastaz aldatua izan da." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "%s ezabatzen" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Pribilegioak berkargatzen" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Hautatutako erabiltzaileak arrakastaz ezabatu dira." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Pribilegioak arrakastaz berkargatu dira." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Editatu Pribilegioak" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Ezeztatu" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Erabiltzailearen info orokorra" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Baimendu" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Edozein" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Erabiltzaile berria gehitu" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Hautatutako erabiltzaileak baztertu" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Erabiltzaileen pribilegio aktibo guztiak ezeztatu eta ondoren denak ezabatu." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Erabiltzaileen izen berdina duten datu-baseak ezabatu." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5168,49 +4858,49 @@ msgstr "" "daitezke. Kasu honetan, jarraitu aurretik %spribilegioak berkargatu%s " "beharko zenituzke." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Hautatutako erabiltzailea ez da pribilegioen taulan aurkitu." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Zutabearen pribilegio espezifikoak" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Pribilegioak gehitu datu-base honetan" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Pribilegioak gehitu taula honetan " -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Aldatu saioa hasteko informazioa / Erabiltzailea kopiatu" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Erabiltzaile berri bat sortu pribilegio berdinekin eta ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... mantendu aurrekoa." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... zaharra ezabatu erabiltzaileen tauletatik." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... zaharraren pribilegio aktibo guztiak errebokatu eta ondoren ezabatu." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5218,44 +4908,44 @@ msgstr "" " ... zaharra ezabatu erabiltzaileen tauletatik eta ondoren berkargatu " "pribilegioak." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Batez" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr ""%s" datu-basearen pribilegioak egiaztatu." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr ""%s"-(e)ra sarbidea duten erabiltzaileak" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "orokorra" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "Datubasearentzat espezifikoa" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "komodina" @@ -7877,25 +7567,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Etiketa" @@ -7947,13 +7637,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "eta orduan" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Itzuli" @@ -8034,7 +7717,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr " %s  zutabe indizean gehituta" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -8151,41 +7834,6 @@ msgstr "Erreferentzien integritatea egiaztatu:" msgid "Show tables" msgstr "Taulak erakutsi" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Erabilitako lekua" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Erabilpena" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Eraginkorra" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Errenkadaren estatistikak" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Sententziak" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinamikoa" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Errenkadaren luzera" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Erabilitako lekua" @@ -8219,7 +7867,6 @@ msgid "Row length" msgstr "Errenkadaren luzera" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Errenkadaren tamaina " @@ -8292,50 +7939,50 @@ msgstr "Batez" msgid "Column %s has been dropped" msgstr "%s taula ezabatu egin da" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Lehen mailako gakoa gehitu zaio %s-(r)i" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Indize bat gehitu gehitu zaio %s-(r)i" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Erlazioen ikuspegia" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Taularen egituraren proposamena " -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "Gehitu %s zutabe" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Taularen amaieran" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Taularen hasieran" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "%s(a)ren ondoren" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Indize bat sortu  %s  zutabetan" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8377,6 +8024,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8719,6 +8370,10 @@ msgstr "Taula berrizendatu izen honetara: " #~ msgid "Process list" #~ msgstr "Prozesuen zerrenda" +#, fuzzy +#~ msgid "Reload privileges" +#~ msgstr "Pribilegio orokorrak" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/fa.po b/po/fa.po old mode 100755 new mode 100644 index 5331ebfd7..9d2afee15 --- a/po/fa.po +++ b/po/fa.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-05-19 03:54+0200\n" "Last-Translator: \n" "Language-Team: persian \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "نمايش همه" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -39,53 +35,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "جستجو" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "تاييد" @@ -111,7 +91,7 @@ msgstr "این مقدار را استفاده کنید" msgid "Database %1$s has been created." msgstr "پايگاه داده %s حذف گرديد." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 #, fuzzy msgid "Database comment: " msgstr "توضيحات جدول" @@ -139,17 +119,10 @@ msgstr "نام ستونها" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "نوع" @@ -162,7 +135,7 @@ msgstr "نوع" msgid "Null" msgstr "خالي" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -186,24 +159,18 @@ msgstr "پيوند به" msgid "Comments" msgstr "توضيحات" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "خير" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -212,15 +179,9 @@ msgstr "خير" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -239,143 +200,135 @@ msgstr "نمايش الگوي پايگاه داده" msgid "No tables found in database." msgstr "در اين پايگاه داده هيچ جدولي وجود ندارد ." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "انتخاب همه" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "عدم انتخاب همه" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 #, fuzzy msgid "The database name is empty!" msgstr "نام جدول وارد نشده‌است !" -#: db_operations.php:241 +#: db_operations.php:236 #, fuzzy, php-format msgid "Database %s has been renamed to %s" msgstr "جدول %s به %s تغيير نام داده‌شد" -#: db_operations.php:245 +#: db_operations.php:240 #, fuzzy, php-format msgid "Database %s has been copied to %s" msgstr "جدول %s به %s كپي شد." -#: db_operations.php:423 +#: db_operations.php:412 #, fuzzy msgid "Rename database to" msgstr "بازناميدن جدول به" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "دستور" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "و سپس" #: db_operations.php:455 ->>>>>>> origin/master #, fuzzy msgid "Copy database to" msgstr "No databases" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "فقط ساختار" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "ساختار و داده‌ها" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "فقط داده‌ها" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "افزودن %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "" -#: db_operations.php:559 +#: db_operations.php:548 msgctxt "BLOB repository" msgid "Enabled" msgstr "فعال شده" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "غيرفعال" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "مرمت جدول" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "غيرفعال" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "فعال" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "مقایسه" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -384,14 +337,14 @@ msgstr "" "امكانات اضافي براي كاركردن با جدولهاي پيوندي غيرفعال شده‌است . براي پيداكردن " "دليل آن %sاينجا%s را بزنيد ." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "ويرايش صفحات PDF" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -400,11 +353,7 @@ msgstr "جدول" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "سطرها" @@ -412,43 +361,31 @@ msgstr "سطرها" msgid "Size" msgstr "اندازه" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "in use" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master #, fuzzy msgid "Creation" msgstr "ساختن" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -508,11 +445,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "يا" @@ -546,85 +479,85 @@ msgstr "بكارگيري جدولها" msgid "SQL query on database %s:" msgstr "پرس و جوي SQL از پايگاه داده %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Submit Query" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "دسترسي مجاز نيست" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "حداقل يكي از كلمات" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "تمامي كلمات" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "عبارت كامل" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "بعنوان مبين منظم(as regular expression)" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "نتيجه جستجوي \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "مشاهده" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "حذف" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "جستجو در پايگاه‌داده" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "كلمه(ها) يا مقدار(ها) براي جستجو (wildcard: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "نوع جستجو :" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "كلمات با علامت فاصله (\" \") جدا مي‌شوند." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "در جدول(هاي) :" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -632,36 +565,36 @@ msgstr "در جدول(هاي) :" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "درج" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "ساختار" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "حذف" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "خالي كردن" @@ -671,117 +604,111 @@ msgstr "خالي كردن" msgid "Table %s has been emptied" msgstr "جدول %s خالي شد" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, fuzzy, php-format msgid "View %s has been dropped" msgstr "ستون %s حذف گرديد" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "جدول %s حذف گرديد" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "نمایش" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "مجموع" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "" -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "موارد انتخاب‌شده :" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "انتخاب همه" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "عدم انتخاب همه" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "نماي چاپ" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "بررسي جدول" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "بهينه‌سازي جدول" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "مرمت جدول" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "تحليل جدول" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "صدور" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "فرهنگ داده‌ها" @@ -792,10 +719,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -816,8 +743,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "عمل" @@ -853,8 +780,8 @@ msgstr "فقط ساختار" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "بررسي جدول" @@ -930,7 +857,7 @@ msgstr "سطر حذف گرديد ." msgid "Showing bookmark" msgstr "" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "" @@ -1009,285 +936,187 @@ msgstr "نام ميزبان خالي است!" msgid "The user name is empty!" msgstr "نام كاربر خالي است!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "اسم رمز خالي است!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "اسم رمزها مانند هم نمي‌باشد!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "افزودن يك كاربر جديد" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "نسخه سرور" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Edit Privileges" -msgid "Reloading Privileges" -msgstr "ويرايش امتيازات" - -#: js/messages.php:49 -msgid "Removing Selected Users" -msgstr "" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "محلی" - -#: js/messages.php:58 -msgid "Processing Request" -msgstr "" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "تاييد" - -#: js/messages.php:65 -#, fuzzy -msgid "Renaming Databases" -msgstr "بازناميدن جدول به" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "پايگاه داده" - -#: js/messages.php:67 -#, fuzzy -msgid "Copying Database" -msgstr "No databases" - -#: js/messages.php:68 -msgid "Changing Charset" -msgstr "" - -#: js/messages.php:69 -#, fuzzy -#| msgid "You have to choose at least one column to display" -msgid "Table must have atleast 1 column" -msgstr "شما حذاقل بايد يك ستون را براي نمايش انتخاب نماييد" - -#: js/messages.php:70 -#, fuzzy -msgid "Create Table" -msgstr "ساخت يك صفحه جديد" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "جستجو" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "اصلاحات ذخيره گرديد" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "غيرفعال" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "ستون را براي نمايش انتخاب نماييد" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "خير" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "قبل" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "بعد" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "جمع كل" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "دودويي" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "مارس" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "آوريل" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "مي" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "ژوئن" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "جولاي" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "آگوست" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "اكتبر" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "ژانويه" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "فوريه" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "مارس" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "آوريل" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1295,174 +1124,174 @@ msgid "May" msgstr "مي" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "ژوئن" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "جولاي" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "آگوست" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "سپتامبر" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "اكتبر" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "نوامبر" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "دسامبر" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "يكشنبه" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "دوشنبه" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "سه‌شنبه" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "چهارشنبه" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "جمعه" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "شنبه" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "يكشنبه" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "دوشنبه" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "سه‌شنبه" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "چهارشنبه" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "پنج‌شنبه" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "جمعه" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "شنبه" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "يكشنبه" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "دوشنبه" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "سه‌شنبه" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "چهارشنبه" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "پنج‌شنبه" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "جمعه" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "شنبه" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "هفته" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "ساعت" -#: js/messages.php:194 +#: js/messages.php:165 msgid "Minute" msgstr "دقیقه" -#: js/messages.php:195 +#: js/messages.php:166 msgid "Second" msgstr " ثانیه" @@ -1517,7 +1346,7 @@ msgstr "فهرست‌ها" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "يكتا" @@ -1536,7 +1365,7 @@ msgid "Comment" msgstr "توضيحات" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1559,8 +1388,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "پايگاههاي داده" @@ -1723,11 +1552,7 @@ msgstr "اسم رمز:" msgid "Server Choice" msgstr "" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "" @@ -1805,11 +1630,7 @@ msgid "" "necessary extensions appear to be loaded. Check your PHP configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
اگر يك صفحه خالي دريافت كرديد ، همه چيز " "درست است." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "سرور" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "" @@ -1910,7 +1703,7 @@ msgstr "" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "مستندات" @@ -1924,140 +1717,140 @@ msgstr "پرس و جوي SQL" msgid "MySQL said: " msgstr "پيغام MySQL :" -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "شرح دادن SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 #, fuzzy msgid "Skip Explain SQL" msgstr "شرح دادن SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "بدون كد PHP" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "ساخت كد PHP" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 #, fuzzy msgid "Skip Validate SQL" msgstr "معتبرسازي SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "معتبرسازي SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "موتور" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "بايت" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "كيلوبايت" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "مگا بايت" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "گيگا بايت" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "ترابايت" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "پتا بايت" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "اگزا بايت" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d %B %Y ساعت %I:%M %p" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s days, %s hours, %s minutes and %s seconds" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "شروع" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "قبل" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "انتها" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "" -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2076,7 +1869,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "اسم" @@ -2104,16 +1897,16 @@ msgstr "پرس و جو" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 #, fuzzy msgid "Import" msgstr "صدور" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "امتيازات" @@ -2132,11 +1925,7 @@ msgid "" msgstr "" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "" @@ -2153,7 +1942,7 @@ msgstr "" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2163,36 +1952,22 @@ msgid "Change password" msgstr "تغيير اسم رمز" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "بدون اسم رمز" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "اسم رمز" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "تكرار" @@ -2205,20 +1980,12 @@ msgid "MySQL 4.0 compatible" msgstr "" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master #, fuzzy msgid "Generate" msgstr "توليد‌شده توسط" @@ -2232,18 +1999,24 @@ msgstr "ساخت پايگاه داده جديد" msgid "Create" msgstr "ساختن" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 #, fuzzy msgid "No Privileges" msgstr "امتيازات" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "You have to choose at least one column to display" +msgid "Table must have at least one column." +msgstr "شما حذاقل بايد يك ستون را براي نمايش انتخاب نماييد" + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "ساخت جدول جديد در پايگاه داده %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of rows per page" msgid "Number of columns" @@ -2306,11 +2079,7 @@ msgid "remember template" msgstr "" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "مجموعه كاراكترهاي پرونده:" @@ -2321,7 +2090,7 @@ msgstr "فشرده‌سازي" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "خير" @@ -2363,11 +2132,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "محل پرونده متني" @@ -2375,20 +2140,12 @@ msgstr "محل پرونده متني" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "پوشه‌اي را كه براي انتقال فايل انتخاب كرده‌ايد قابل دسترسي نيست." -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "" @@ -2518,11 +2275,7 @@ msgstr "" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "عمليات" @@ -2591,14 +2344,14 @@ msgstr "Showing rows" msgid "total" msgstr "جمع كل" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "تغيير" @@ -2666,11 +2419,7 @@ msgstr "" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "جمع كل" @@ -2915,11 +2664,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "قالب" @@ -2991,13 +2736,8 @@ msgstr "" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "داده" @@ -3047,15 +2787,9 @@ msgstr "" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "ميزبان" @@ -3253,7 +2987,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "No tables" @@ -3266,7 +3000,7 @@ msgstr "نتيجه SQL" msgid "Generated by" msgstr "توليد‌شده توسط" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL يك نتيجه خالي داد. (مثلا 0 سطر)." @@ -3413,20 +3147,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "اصلي" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "فهرست" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "كاملا متن" @@ -3654,6 +3388,10 @@ msgstr "" msgid "not OK" msgstr "not OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "تاييد" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "فعال" @@ -3675,7 +3413,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "" @@ -3726,13 +3464,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "نام كاربر" @@ -3750,22 +3483,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "متغییر" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "مقدار" @@ -3784,40 +3509,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "همه كاربران" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "همه ميزبانها" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "محلی" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3841,7 +3537,6 @@ msgid "Use Host Table" msgstr "" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3876,31 +3571,31 @@ msgstr "زبانِ ناشناس : %1$s." msgid "Servers" msgstr "سرور" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 #, fuzzy msgid "Variables" msgstr "متغییر" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "موتور" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 #, fuzzy msgid "Binary log" msgstr "دودويي" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3929,51 +3624,51 @@ msgstr "" msgid "Target database" msgstr "جستجو در پايگاه‌داده" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, fuzzy, php-format msgid "Run SQL query/queries on server %s" msgstr "اجراي پرس و جو(ها)ي SQL در پايگاه‌داده %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "اجراي پرس و جو(ها)ي SQL در پايگاه‌داده %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "نام ستونها" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " نمايش دوباره اين پرس و جو در اينجا " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "ارسال" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "" @@ -4134,12 +3829,12 @@ msgstr "" msgid "Save" msgstr "ذخيره" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format msgid "Add %s column(s)" msgstr "افزودن ستون جديد" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to add at least one column." @@ -4274,8 +3969,8 @@ msgstr "Reset" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "كاربر" @@ -4706,326 +4401,326 @@ msgstr "" msgid "View dump (schema) of databases" msgstr "نمايش الگوي پايگاه داده" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "" -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "" -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "" -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "" -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "" -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "" -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "" -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "" -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "" -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "" -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "" -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "" -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "" -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "" -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "" -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." msgstr "" -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "" -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "" -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "" -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "" -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "" -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "" -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " "killing threads of other users." msgstr "" -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "" -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 #, fuzzy msgid "No privileges." msgstr "امتيازات" -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "خير" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " نكته : نام امتيازات MySQL به زبان انگليسي بيان مي‌شود ." -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "مدیریت" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "اطلاعات ورود" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "عدم تغيير اسم رمز" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "هيچ كاربري وچود ندارد." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "شما يك كاربر جديد اضافه كرديد." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "امتيازات %s به هنگام گرديد." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "شما امتيازات %s را ابطال كرديد" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "" -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "در حال پاک کردن %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "" -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "" -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "ويرايش امتيازات" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "ابطال" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 #, fuzzy msgid "Grant" msgstr "چاپ" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "همه" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "افزودن يك كاربر جديد" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "" -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5034,91 +4729,91 @@ msgid "" "sreload the privileges%s before you continue." msgstr "" -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "" -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "" -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "" -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr "" -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "خير" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "" @@ -7717,25 +7412,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "" @@ -7785,13 +7480,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "و سپس" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "برو به صفحه قبل" @@ -7871,7 +7559,7 @@ msgstr "(فقط و فقط بايد \"PRIMARY\" نام يك كليد اص msgid "Add to index  %s column(s)" msgstr "ساخت يك فهرست در %s ستون" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -7987,41 +7675,6 @@ msgstr "" msgid "Show tables" msgstr "نمايش جدولها" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "فضاي استفاده‌شده" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "استفاده" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "موثر" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "آمار سطرها" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "شرج" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "پويا" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "طول سطر" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "فضاي استفاده‌شده" @@ -8055,7 +7708,6 @@ msgid "Row length" msgstr "طول سطر" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " اندازه سطر " @@ -8127,49 +7779,49 @@ msgstr "خير" msgid "Column %s has been dropped" msgstr "جدول %s حذف گرديد" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "يك كليد اصلي در %s اضافه شد" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "يك فهرست در %s اضافه گرديد." -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "پيشنهاد ساختار جدول" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy msgid "Add column" msgstr "افزودن ستون جديد" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "در انتهاي جدول" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "در ابتداي جدول" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "بعد از %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "ساخت يك فهرست در %s ستون" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8211,6 +7863,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/fi.po b/po/fi.po old mode 100755 new mode 100644 index 311af2a6a..90ea12eec --- a/po/fi.po +++ b/po/fi.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-04-30 18:08+0200\n" "Last-Translator: \n" "Language-Team: finnish \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Näytä kaikki" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Etsi" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Siirry" @@ -114,7 +94,7 @@ msgstr "Käytä tätä arvoa" msgid "Database %1$s has been created." msgstr "Tietokanta %1$s on luotu." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Tietokannan kommentti: " @@ -141,17 +121,10 @@ msgstr "Sarakkeiden nimet" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Tyyppi" @@ -164,7 +137,7 @@ msgstr "Tyyppi" msgid "Null" msgstr "Tyhjä" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -188,24 +161,18 @@ msgstr "Linkitys sarakkeeseen:" msgid "Comments" msgstr "Kommentit" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Ei" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -214,15 +181,9 @@ msgstr "Ei" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -241,141 +202,133 @@ msgstr "Tee vedos tietokannasta" msgid "No tables found in database." msgstr "Tietokannassa ei ole tauluja." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Valitse kaikki" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Poista valinta kaikista" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Tietokannan nimi on tyhjä!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Tietokannan %s nimi on nyt %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Tietokanta %s on kopioitu tietokantaan %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Muuta tietokannan nimi" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Komento" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "ja sen jälkeen" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Luo tietokannasta toinen tietokanta nimellä" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Vain rakenne" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Rakenne ja tiedot" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Vain tiedot" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "Suorita CREATE DATABASE ennen kopioimista" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Lisää %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Lisää AUTO_INCREMENT-arvo" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Lisää rajoitteet" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Siirry kopioituun tietokantaan" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "BLOB-tietokanta" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Tila" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Päällä" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Poista käytöstä" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Vioittunut" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair" msgctxt "BLOB repository" msgid "Repair" msgstr "Korjaa" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Pois päältä" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Ota käyttöön" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Aakkosjärjestys" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -384,14 +337,14 @@ msgstr "" "Linkitettyihin tauluihin liittyvät lisäominaisuudet eivät ole käytössä. " "Katso %slisätietoja%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Muokkaa PDF-sivuja" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -400,11 +353,7 @@ msgstr "Taulu" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Kpl rivejä" @@ -412,42 +361,30 @@ msgstr "Kpl rivejä" msgid "Size" msgstr "Koko" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "käytössä" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Luotu" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Viimeksi päivitetty" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Viimeksi tarkistettu" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -508,11 +445,7 @@ msgstr "Poista" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Tai" @@ -546,85 +479,85 @@ msgstr "Käytä tauluja" msgid "SQL query on database %s:" msgstr "Suorita SQL-kysely tietokannassa %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Suorita" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Käyttö estetty" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "vähintään yksi sanoista" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "kaikki sanat" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "koko lause" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "regexp-haku" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Tulokset hakusanalla \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s hakutulosta taulussa %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Selaa" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Poista" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Yhteensä: %s hakutulosta" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Hae tietokannasta" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Haettavat sanat tai arvot (%-merkkiä voi käyttää jokerimerkkinä):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Hae:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Sanat erotetaan välilyönnein." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Tauluista:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -632,36 +565,36 @@ msgstr "Kentän sisältä:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Lisää rivi" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Rakenne" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Tuhoa" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Tyhjennä" @@ -671,25 +604,25 @@ msgstr "Tyhjennä" msgid "Table %s has been emptied" msgstr "Taulu %s on tyhjennetty" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Näkymä %s on poistettu" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Taulu %s on poistettu" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "Seuranta on käytössä." -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "Seuranta ei ole käytössä." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -698,92 +631,86 @@ msgstr "" "Tässä näkymässä on vähintään tämän luvun verran rivejä. Katso lisätietoja %" "sohjeista%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Näkymä" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replikaatio" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Summa" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s on tämän MySQL-palvelimen oletustallennusmoottori." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Valitut:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Valitse kaikki" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Poista valinta kaikista" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Valitse taulut, joissa on ylijäämää" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Tulostusversio" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Tarkista taulu" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimoi taulu" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Korjaa taulu" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analysoi taulu" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Vienti" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Tietosanasto" @@ -794,10 +721,10 @@ msgstr "Seurattavat taulut" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -817,8 +744,8 @@ msgstr "Päivitetty" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Toiminnot" @@ -852,8 +779,8 @@ msgstr "Rakenteen kuvaus" msgid "Untracked tables" msgstr "Seuraamattomat taulut" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "Seuraa taulua" @@ -935,7 +862,7 @@ msgstr "Kirjanmerkki on poistettu." msgid "Showing bookmark" msgstr "Näytetään kirjanmerkki" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Kirjanmerkki %s luotu" @@ -1020,296 +947,187 @@ msgstr "Palvelimen nimi puuttuu!" msgid "The user name is empty!" msgstr "Käyttäjän nimi puuttuu!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Salasana puuttuu!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Salasanat eivät ole samat!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Lisää uusi käyttäjä" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create version" -msgid "Create User" -msgstr "Luo versio" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Lataa käyttöoikeudet uudelleen" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Poista valitut käyttäjät" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "Sulje" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Peruuta" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Lataa asetukset" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Prosessit" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "Kunnossa" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Muuta tietokannan nimi" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Tietokanta" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Luo tietokannasta toinen tietokanta nimellä" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Merkistökoodaus" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Taulussa on oltava vähintään yksi kenttä." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Luo taulu" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Etsi" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Muutokset tallennettu" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Relaatio poistettu" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "FOREIGN KEY -relaatio lisätty" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Sisäinen relaatio luotu" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Virhe: Relaatiota ei luotu." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Virhe: relaatio on jo olemassa." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Virhe tallennettaessa koordinaatteja Suunnittelijaan." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Yleiset relaatio-ominaisuudet" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Pois päältä" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Valitse viitattava avain" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Valitse liiteavain" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Valitse perusavain tai uniikki avain" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Valitse näytettävä sarake" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "Donate" msgid "Done" msgstr "Lahjoita" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Edellinen" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Seuraava" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Yhteensä" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Binääritietoa" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Maalis" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Huhti" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Touko" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Kesä" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Heinä" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Elo" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Loka" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Tammi" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Helmi" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Maalis" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Huhti" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1317,178 +1135,178 @@ msgid "May" msgstr "Touko" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Kesä" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Heinä" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Elo" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Syys" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Loka" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Marras" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Joulu" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Su" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Ma" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Ti" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Pe" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Su" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Ma" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Ti" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Ke" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "To" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Pe" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "La" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Su" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Ma" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Ti" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Ke" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "To" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Pe" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "La" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "Wiki" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "käytössä" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1549,7 +1367,7 @@ msgstr "Indeksit" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Uniikki" @@ -1567,7 +1385,7 @@ msgid "Comment" msgstr "Kommentti" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1592,8 +1410,8 @@ msgstr "" "Indeksit %1$s ja %2$s ovat ehkä samoja, ja niistä jompikumpi kannattanee " "poistaa." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Tietokannat" @@ -1766,11 +1584,7 @@ msgstr "Salasana:" msgid "Server Choice" msgstr "Valitse palvelin" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Selaimessa on oltava evästeet päällä tästä lähtien." @@ -1854,11 +1668,7 @@ msgstr "" "Iconv-, libiconv- tai recode_string-funktioita ei voitu käyttää. Tarkista " "PHP:n asetukset." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Jos linkistä avautuva sivu on tyhjä, asetustiedostossa ei ollut virhettä." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Oletusasetuksia ei voitu ladata kohteesta: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" msgstr "$cfg['PmaAbsoluteUri'] täytyy määritellä asetustiedostossa!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Virheellinen palvelimen indeksi: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "Palvelimella %1$s virheellinen nimi. Tarkista asetukset." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Palvelin" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Asetuksissa on virheellinen todennustapa:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Asetuksissa on virheellinen todennustapa:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Sinun tulisi päivittää versioon %s %s tai sitä uudempaan." @@ -1962,7 +1744,7 @@ msgstr "Lähetetty" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Ohjeet" @@ -1976,138 +1758,138 @@ msgstr "SQL-kysely" msgid "MySQL said: " msgstr "MySQL ilmoittaa: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Selitä SQL-kysely" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Älä selitä SQL-kyselyä" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "Kätke PHP-koodi" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Näytä PHP-koodi" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Päivitä" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Älä tarkista SQL-kyselyä" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Tarkista SQL-lause" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Moottorit" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Profilointi" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Aika" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "tavua" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "kt" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "Mt" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "Gt" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "Tt" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "Pt" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "Et" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr " " #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d.%m.%Y klo %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s päivää, %s tuntia, %s minuuttia ja %s sekuntia" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Alkuun" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Edellinen" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Loppu" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Siirry tietokantaan "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "Toimintoon %s vaikuttaa tunnettu vika, katso %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2126,7 +1908,7 @@ msgid "Events" msgstr "Tapahtumat" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Nimi" @@ -2154,15 +1936,15 @@ msgstr "Haku" msgid "Designer" msgstr "Suunnittelija" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Tuonti" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Käyttöoikeudet" @@ -2181,11 +1963,7 @@ msgid "" msgstr "Saattaa olla summittainen. Katso FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Ylijäämä" @@ -2205,7 +1983,7 @@ msgstr "" "(tai paikallisen MySQL-palvelimen pistokkeen asetuksia ei ole määritelty " "oikein)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Lisätiedot..." @@ -2215,36 +1993,22 @@ msgid "Change password" msgstr "Vaihda salasana" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Ei salasanaa" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Salasana" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Kirjoita uudelleen" @@ -2259,20 +2023,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 -yhteensopiva" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Keksi salasana" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Keksi" @@ -2285,17 +2041,23 @@ msgstr "Luo uusi tietokanta" msgid "Create" msgstr "Luo" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Ei käyttöoikeuksia" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Taulussa on oltava vähintään yksi kenttä." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Luo uusi taulu tietokantaan %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2360,11 +2122,7 @@ msgid "remember template" msgstr "muista pohja" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Tiedoston merkistö:" @@ -2375,7 +2133,7 @@ msgstr "Pakkaus" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Ei mitään" @@ -2422,11 +2180,7 @@ msgstr "" msgid "File to import" msgstr "Tuotava tiedosto" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Tiedoston sijainti" @@ -2434,20 +2188,12 @@ msgstr "Tiedoston sijainti" msgid "File uploads are not allowed on this server." msgstr "Tällä palvelimella ei ole sallittu tiedostojen lähetystä." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Tiedostojen lähetykseen valittua hakemistoa ei voida käyttää" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "palvelimen lähetyshakemisto" @@ -2583,11 +2329,7 @@ msgstr "Lajittele avaimen mukaan" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Valinnat" @@ -2657,14 +2399,14 @@ msgstr "Näkyvillä rivit " msgid "total" msgstr "yhteensä" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "kysely kesti %01.4f sek." #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Muokkaa" @@ -2733,11 +2475,7 @@ msgstr "Puskurivarannon käyttö" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Yhteensä" @@ -3022,11 +2760,7 @@ msgstr "" "numero." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Muoto" @@ -3100,13 +2834,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Tietoa" @@ -3155,15 +2884,9 @@ msgstr "MIME-tyyppi" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Palvelin" @@ -3358,7 +3081,7 @@ msgstr "Vie sisällöt" msgid "Open new phpMyAdmin window" msgstr "Avaa uusi phpMyAdmin-ikkuna" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Ei tauluja" @@ -3371,7 +3094,7 @@ msgstr "SQL-kyselyn tulos" msgid "Generated by" msgstr "Luontiympäristö" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL palautti tyhjän vastauksen, toisin sanoen nolla riviä." @@ -3522,20 +3245,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Perusavain" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Indeksi" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Koko teksti" @@ -3760,6 +3483,10 @@ msgstr "Tälle tiedostomuodolle ei ole valinta-asetuksia" msgid "not OK" msgstr "Ei kunnossa" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "Kunnossa" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Päällä" @@ -3781,7 +3508,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "Tarkista ohjeista, kuinka Column_comments-tauluja voi päivittää." -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Tallennettu SQL-kysely" @@ -3834,13 +3561,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Käyttäjänimi" @@ -3857,22 +3579,14 @@ msgstr "Isännän tila" msgid "Slave status" msgstr "Alipalvelimen tila" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Muuttuja" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Arvo" @@ -3892,40 +3606,11 @@ msgstr "" msgid "Add slave replication user" msgstr "Lisää alireplikaatiokäyttäjä" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Kuka tahansa käyttäjä" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Käytä tekstikenttää" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Mikä tahansa palvelin" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Paikallinen" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Tämä isäntä" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Käytä isäntätaulua" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3949,7 +3634,6 @@ msgid "Use Host Table" msgstr "Käytä isäntätaulua" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3985,29 +3669,29 @@ msgstr "Tuntematon kieli: %1$s." msgid "Servers" msgstr "Palvelimet" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Muuttujat" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Merkistöt" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Moottorit" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Binääriloki" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Prosessit" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Yhtenäistä" @@ -4034,51 +3718,51 @@ msgstr "Ero" msgid "Target database" msgstr "Kohdetietokanta" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Suorita SQL-kysely(jä) palvelimella %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Suorita SQL-kyselyjä tietokannassa %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Sarakkeiden nimet" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Tallenna SQL-kysely" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Anna kaikkien käyttäjien käyttää tätä kirjanmerkkiä" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Korvaa samanniminen, olemassa oleva kirjanmerkki" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Älä korvaa tätä kyselyä ikkunan ulkopuolelta" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Erotinmerkki" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Näytä kyselylause uudelleen " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Lähetä" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Näytä" @@ -4253,13 +3937,13 @@ msgstr "PARTITION-määritelmä" msgid "Save" msgstr "Tallenna" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add column(s)" msgid "Add %s column(s)" msgstr "Lisää sarake/sarakkeita" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4476,8 +4160,8 @@ msgstr "Nollaa" msgid "Protocol version" msgstr "Protokollan versio" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Käyttäjä" @@ -4936,114 +4620,114 @@ msgstr "Tallennusmoottorit" msgid "View dump (schema) of databases" msgstr "Näytä tietokannoista vedos (skeema)" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Sisältää kaikki käyttöoikeudet GRANT-oikeutta lukuun ottamatta." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Sallii muuttaa olemassa olevien taulujen rakennetta." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Sallii talletettujen rutiinien muuntamisen ja poistamisen." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Sallii uusien tietokantojen ja taulujen luomisen." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Sallii talletettujen rutiinien luomisen." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Sallii uusien taulujen luomisen." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Sallii tilapäisten taulujen luomisen." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Sallii käyttäjätilien luomisen, poistamisen ja uudelleennimeämisen." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Sallii uusien näkymien luomisen." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Sallii tietojen poistamisen." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Sallii tietokantojen ja taulujen poistamisen." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Sallii taulujen poistamisen." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Sallii luoda tapahtuma-ajastimelle tapahtumia" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Sallii talletettujen rutiinien suorittamisen." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Sallii tietojen tuomisen ja viemisen." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Sallii käyttäjien ja käyttöoikeuksien lisäämisen lataamatta " "käyttöoikeustauluja uudestaan." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Sallii indeksien luomisen ja poistamisen." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Sallii tietojen lisäämisen ja korvaamisen." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Sallii taulujen lukitsemisen nykyiselle säikeelle." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Rajoittaa käyttäjän tunnissa luomien uusien yhteyksien määrän." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Rajoittaa käyttäjän tunnissa palvelimelle lähettämien kyselyjen määrän." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5051,60 +4735,60 @@ msgstr "" "Rajoittaa, kuinka monta monta kertaa käyttäjä saa suorittaa tauluihin tai " "tietokantoihin muutoksia tekeviä komentoja tunnin aikana." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Rajoittaa käyttäjän yhtäaikaisten yhteyksien määrän." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Sallii kaikkien käyttäjien prosessien näyttämisen" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Ei vaikutusta tässä MySQL-palvelimen versiossa." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Sallii palvelinasetusten uudelleenlataamisen ja palvelimen välimuistin " "tyhjentämisen." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Sallii käyttäjän kysyä, missä ali- ja pääpalvelimet sijaitsevat." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Tarvitaan replikaatiota käyttävissä alipalvelimissa." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Sallii tietojen lukemisen." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Sallii koko tietokantaluettelon käytön." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Sallii SHOW CREATE VIEW -kyselyjen suorittamisen." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Sallii palvelimen sammuttamisen." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5114,157 +4798,157 @@ msgstr "" "saavutettu; Tarvitaan useissa pääkäyttäjän toiminnoissa kuten globaalien " "muuttujien asettamisessa ja muitten käyttäjien säikeiden lopettamisessa." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Sallii herättimien eli laukaisinten luomisen ja poistamisen" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Sallii tietojen muuttamisen." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Ei käyttöoikeuksia." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Ei mitään" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Taulukohtaiset käyttöoikeudet" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Huom! MySQL-käyttöoikeuksien nimet ovat englanniksi! " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Globaalit käyttöoikeudet" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Tietokantakohtaiset käyttöoikeudet" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Hallinta" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Resurssirajoitukset" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Huom: Näiden valintojen asettaminen nollaksi (0) poistaa rajoituksen." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Kirjautumistiedot" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Älä vaihda salasanaa" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Käyttäjiä ei ole." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Käyttäjä %s on jo olemassa!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Uusi käyttäjä lisätty." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Käyttäjän %s käyttöoikeudet on päivitetty." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Käyttäjän %s käyttöoikeudet on poistettu" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Käyttäjän %s salasanan vaihto onnistui." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Poistetaan: %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Yhtään käyttäjää ei valittu poistettavaksi!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Ladataan käyttöoikeuksia uudelleen" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Valitsemiesi käyttäjien poisto onnistui." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Käyttöoikeuksien uudelleenlataus onnistui." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Muokkaa käyttöoikeuksia" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Pura käyttöoikeudet" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Käyttäjien yleiskatsaus" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Valtuudet (GRANT)" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Mikä tahansa" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Lisää uusi käyttäjä" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Poista valitut käyttäjät" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Pura kaikki käyttäjän aktiiviset käyttöoikeudet, ja poista ne sen jälkeen." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Poista tietokannat, joilla on sama nimi kuin käyttäjillä." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5277,52 +4961,52 @@ msgstr "" "käyttämistä käyttöoikeuksista, jos tauluihin on tehty muutoksia käsin. " "Tällöin %skäyttöoikeudet on ladattava uudestaan%s ennen jatkamista." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Valittua käyttäjää ei löytynyt käyttöoikeustaulusta." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Sarakekohtaiset käyttöoikeudet" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Lisää käyttöoikeudet seuraavaan tietokantaan" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Korvausmerkkien _ ja % eteen on lisättävä \\-merkki, jotta ne näkyisivät " "oikein" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Lisää käyttöoikeudet seuraavaan tauluun" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Vaihda kirjautumistietoja / Kopioi käyttäjä" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Luo uusi käyttäjä samoilla käyttöoikeuksilla ja ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... säilytä vanha käyttäjä." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... poista vanha käyttäjä käyttäjätauluista." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... peruuta kaikki vanhan käyttäjän aktiiviset käyttöoikeudet ja tuhoa " "käyttäjä sen jälkeen." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5330,45 +5014,45 @@ msgstr "" " ... poista vanha käyttäjä käyttäjätauluista ja lataa käyttöoikeudet sen " "jälkeen uudelleen." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Tietokanta käyttäjälle" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Ei mitään" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Luo samanniminen tietokanta ja anna kaikki oikeudet" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" "Anna kaikki oikeudet tietokannalle käyttäen korvausmerkkiä (username\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "Anna tietokannalle "%s" kaikki oikeudet" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Käyttäjät, joilla on oikeus käyttää kohdetta "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "globaali" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "tietokantakohtainen" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "korvausmerkki" @@ -8337,25 +8021,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "Lisätyn rivin tunnus: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Näytetään PHP-koodina" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Näytetään SQL-kysely" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Taulun \"%s\" indeksien kanssa on ongelmia" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Tunniste" @@ -8408,13 +8092,6 @@ msgstr "" msgid "Show insert query" msgstr "Näytetään SQL-kysely" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "ja sen jälkeen" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Takaisin" @@ -8495,7 +8172,7 @@ msgstr "(\"PRIMARY\" saa olla vain ja ainoastaan perusavaimen nimenä!)" msgid "Add to index  %s column(s)" msgstr "Lisää indeksiin %s sarake(tta)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Sarakkeiden määrän on oltava nollaa suurempi." @@ -8609,41 +8286,6 @@ msgstr "Tarkista viitteiden eheys:" msgid "Show tables" msgstr "Näytä taulut" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Levytilan käyttö" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Käyttö" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Pätevä" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Rivitilastot" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Tieto" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "staattinen" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dynaaminen" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Rivin pituus" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Levytilan käyttö" @@ -8677,7 +8319,6 @@ msgid "Row length" msgstr "Rivin pituus" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Rivin koko " @@ -8753,50 +8394,50 @@ msgstr "Ei mitään" msgid "Column %s has been dropped" msgstr "Taulu %s on poistettu" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Sarakkeelle %s on luotu perusavain" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Sarakkeelle %s on lisätty indeksi" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Relaationäkymä" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Esitä taulun rakenne" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add column(s)" msgid "Add column" msgstr "Lisää sarake/sarakkeita" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Taulun loppuun" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Taulun alkuun" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Jälkeen sarakkeen: %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Luo  %s:n sarakkeen indeksi" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "ositettu" @@ -8840,6 +8481,10 @@ msgstr "Kommentoi nämä kaksi riviä pois, mikäli et tarvitse niitä." msgid "SQL statements exported. Please copy the dump or execute it." msgstr "SQL-lauseet viety. Kopioi vedos tai suorita se." +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "Sulje" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -9281,6 +8926,9 @@ msgstr "Nimeä taulu uudelleen" #~ msgid "Process list" #~ msgstr "Prosessiluettelo" +#~ msgid "Reload privileges" +#~ msgstr "Lataa käyttöoikeudet uudelleen" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/fr.po b/po/fr.po old mode 100755 new mode 100644 index 99a87945f..4754e6397 --- a/po/fr.po +++ b/po/fr.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-07-01 19:56+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Tout afficher" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Rechercher" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Exécuter" @@ -114,7 +94,7 @@ msgstr "Utiliser cette valeur" msgid "Database %1$s has been created." msgstr "La base de données %1$s a été créée." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Commentaire sur la base de données: " @@ -139,17 +119,10 @@ msgstr "Colonne" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Type" @@ -162,7 +135,7 @@ msgstr "Type" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -186,24 +159,18 @@ msgstr "Relié à" msgid "Comments" msgstr "Commentaires" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Non" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -212,15 +179,9 @@ msgstr "Non" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -239,135 +200,127 @@ msgstr "Schéma et données de la base" msgid "No tables found in database." msgstr "Aucune table n'a été trouvée dans cette base." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Tout sélectionner" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Tout désélectionner" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Le nom de la base de données est vide!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "La base de données %s a été renommée en %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "La base de données %s a été copiée sur %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Changer le nom de la base de données pour" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Commande" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "et ensuite" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Copier la base de données vers" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Structure seule" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Structure et données" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Données seulement" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "Faire CREATE DATABASE avant la copie" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Ajouter %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Inclure la valeur courante de l'AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Inclure les contraintes de clés étrangères" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Aller à la base de données copiée" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "Dépôt BLOB" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "État" -#: db_operations.php:559 +#: db_operations.php:548 msgctxt "BLOB repository" msgid "Enabled" msgstr "Activé" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Désactiver" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Endommagé" -#: db_operations.php:577 +#: db_operations.php:566 msgctxt "BLOB repository" msgid "Repair" msgstr "Réparer" -#: db_operations.php:585 +#: db_operations.php:574 msgctxt "BLOB repository" msgid "Disabled" msgstr "Désactivé" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Activer" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Interclassement" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -376,14 +329,14 @@ msgstr "" "Certaines fonctionnalités ayant trait aux tables reliées sont désactivées. " "Pour une analyse du problème, cliquez %sici%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Préparer le schéma en PDF" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -392,11 +345,7 @@ msgstr "Table" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Enregistrements" @@ -404,42 +353,30 @@ msgstr "Enregistrements" msgid "Size" msgstr "Taille" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "utilisé" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Création" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Dernière modification" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Dernière vérification" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, php-format msgid "%s table" msgid_plural "%s tables" @@ -499,11 +436,7 @@ msgstr "Effacer" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Ou" @@ -533,120 +466,120 @@ msgstr "Utiliser les tables" msgid "SQL query on database %s:" msgstr "Requête SQL sur la base %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Exécuter la requête" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Accès refusé" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "au moins un mot" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "tous les mots" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "phrase exacte" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "expression réguliére" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Résultats de la recherche de «%s» %s :" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s occurence(s) dans la table %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Afficher" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Effacer" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Total : %s occurence(s)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Effectuer une nouvelle recherche dans la base de données" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Mot ou Valeur à rechercher (passe-partout: «%») :" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Type de recherche :" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Séparer les mots par un espace (« »)." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Dans la(les) table(s) :" -#: db_search.php:367 +#: db_search.php:355 msgid "Inside column:" msgstr "Dans la colonne:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Insérer" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Structure" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Supprimer" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Vider" @@ -656,25 +589,25 @@ msgstr "Vider" msgid "Table %s has been emptied" msgstr "La table %s a été vidée" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "La vue %s a été supprimée" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "La table %s a été effacée" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "Le suivi est actif." -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "Le suivi n'est pas activé." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -683,92 +616,86 @@ msgstr "" "Cette vue contient au moins ce nombre d'enregistrements. Veuillez référer à %" "sdocumentation%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Vue" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Réplication" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Somme" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "Sur ce serveur MySQL, le moteur de stockage par défaut est %s." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Pour la sélection :" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Tout cocher" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Tout décocher" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Cocher tables avec pertes" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Version imprimable" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Vérifier la table" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimiser la table" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Réparer la table" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analyser la table" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Exporter" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Dictionnaire de données" @@ -779,10 +706,10 @@ msgstr "Tables faisant l'objet d'un suivi" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -802,8 +729,8 @@ msgstr "Mis à jour" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Action" @@ -837,8 +764,8 @@ msgstr "Instantané" msgid "Untracked tables" msgstr "Tables ne faisant pas l'objet d'un suivi" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "Suivre la table" @@ -926,7 +853,7 @@ msgstr "Le signet a été effacé." msgid "Showing bookmark" msgstr "Affichage du signet" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Signet %s créé" @@ -1014,425 +941,316 @@ msgstr "Le nom de serveur est vide" msgid "The user name is empty!" msgstr "Le nom d'utilisateur est vide" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Le mot de passe est vide" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Les mots de passe doivent être identiques" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Ajouter un utilisateur" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create version" -msgid "Create User" -msgstr "Créer une version" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reloading the privileges" -msgid "Reloading Privileges" -msgstr "Chargement des privilèges en cours." - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Effacer les utilisateurs sélectionnés." - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "Fermer" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Annuler" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Charger" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Processus" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Changer le nom de la base de données pour" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Base de données" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Copier la base de données vers" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Jeu de caractères" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one column." -msgid "Table must have atleast 1 column" -msgstr "La table doit comporter au moins une colonne" - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Nouvelle table" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Rechercher" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Les modifications ont été sauvegardées." -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Relation supprimée" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "Relation de type FOREIGN KEY ajoutée" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Relation interne ajoutée" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Erreur: relation non ajoutée." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Erreur: relation déjà existante." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Erreur lors de la sauvegarde des coordonnées Concepteur." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Fonctions relationnelles" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Désactivé" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Sélectionnez la clé référencée" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Choisissez la clé étrangère" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Veuillez choisir la clé primaire ou un index unique" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 msgid "Choose column to display" msgstr "Colonne descriptive" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 msgid "Done" msgstr "Fermer" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 msgid "Prev" msgstr "Précédent" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Suivant" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 msgid "Today" msgstr "Aujourd'hui" -#: js/messages.php:111 +#: js/messages.php:82 msgid "January" msgstr "Janvier" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "Février" -#: js/messages.php:113 +#: js/messages.php:84 msgid "March" msgstr "Mars" -#: js/messages.php:114 +#: js/messages.php:85 msgid "April" msgstr "Avril" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Mai" -#: js/messages.php:116 +#: js/messages.php:87 msgid "June" msgstr "Juin" -#: js/messages.php:117 +#: js/messages.php:88 msgid "July" msgstr "Juillet" -#: js/messages.php:118 +#: js/messages.php:89 msgid "August" msgstr "Août" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "Septembre" -#: js/messages.php:120 +#: js/messages.php:91 msgid "October" msgstr "Octobre" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "Novembre" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "Décembre" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Janvier" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Février" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mars" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Avril" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 msgctxt "Short month name" msgid "May" msgstr "Mai" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Juin" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Juillet" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Août" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Septembre" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Octobre" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Novembre" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Décembre" -#: js/messages.php:151 +#: js/messages.php:122 msgid "Sunday" msgstr "Dimanche" -#: js/messages.php:152 +#: js/messages.php:123 msgid "Monday" msgstr "Lundi" -#: js/messages.php:153 +#: js/messages.php:124 msgid "Tuesday" msgstr "Mardi" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "Mercredi" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "Jeudi" -#: js/messages.php:156 +#: js/messages.php:127 msgid "Friday" msgstr "Vendredi" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "Samedi" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Dim" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Lun" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Mar" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Mer" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Jeu" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Ven" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sam" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 msgid "Su" msgstr "Di" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 msgid "Mo" msgstr "Lu" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 msgid "Tu" msgstr "Ma" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 msgid "We" msgstr "Me" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 msgid "Th" msgstr "Je" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 msgid "Fr" msgstr "Ve" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 msgid "Sa" msgstr "Sa" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "Sem" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "Heure" -#: js/messages.php:194 +#: js/messages.php:165 msgid "Minute" msgstr "Minute" -#: js/messages.php:195 +#: js/messages.php:166 msgid "Second" msgstr "Seconde" @@ -1493,7 +1311,7 @@ msgstr "Index" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unique" @@ -1511,7 +1329,7 @@ msgid "Comment" msgstr "Commentaire" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1536,8 +1354,8 @@ msgstr "" "Les index %1$s et %2$s semblent identiques et l'un d'eux pourrait être " "supprimé." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Bases de données" @@ -1709,11 +1527,7 @@ msgstr "Mot de passe :" msgid "Server Choice" msgstr "Choix du serveur" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Vous devez accepter les cookies pour poursuivre." @@ -1796,11 +1610,7 @@ msgstr "" "ces extensions semblent chargées. Veuillez vérifier votre configuration de " "PHP." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Si vous recevez une page blanche, aucune erreur " "n'a été détectée." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "Chargement de la configuration par défaut impossible depuis %1$s" # OK -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1838,50 +1640,30 @@ msgstr "" "Le paramètre $cfg['PmaAbsoluteUri'] DOIT être renseigné dans votre " "fichier de configuration !" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "Indice de serveur invalide: %s" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" "Nom d'hôte (hostname) invalide pour le serveur %1$s. Veuillez vérifier votre " "configuration." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Serveur" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -======= #: libraries/common.inc.php:816 ->>>>>>> origin/master msgid "Invalid authentication method set in configuration:" msgstr "" "Le fichier de configuration contient un type d'authentification invalide :" -<<<<<<< HEAD -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Vous devriez utiliser %s en version %s ou plus récente." @@ -1907,7 +1689,7 @@ msgstr "fr" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Documentation" @@ -1921,136 +1703,136 @@ msgstr "Requête SQL" msgid "MySQL said: " msgstr "MySQL a répondu: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Expliquer SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Ne pas expliquer SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "Sans source PHP" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Créer source PHP" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Actualiser" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Ne pas valider SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Valider SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "Éditer cette requête en ligne" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "En ligne" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Profilage" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Durée" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "o" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "Kio" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "Mio" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "Gio" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "Tio" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "Pio" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "Eio" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr " " #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%A %d %B %Y à %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s jours, %s heures, %s minutes et %s secondes" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Début" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Précédent" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Fin" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Aller à la base de données "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "La fonctionnalité %s est affectée par une anomalie connue, voir %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2071,7 +1853,7 @@ msgid "Events" msgstr "Événements" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Nom" @@ -2099,15 +1881,15 @@ msgstr "Requête" msgid "Designer" msgstr "Concepteur" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Importer" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privilèges" @@ -2128,11 +1910,7 @@ msgstr "" "FAQ 3.11[/a]" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Perte" @@ -2152,7 +1930,7 @@ msgstr "" "(ou l'interface de connexion (socket) vers le serveur MySQL local n'est pas " "correctement configurée)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Détails..." @@ -2162,36 +1940,22 @@ msgid "Change password" msgstr "Modifier le mot de passe" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Aucun mot de passe" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Mot de passe" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Entrer à nouveau" @@ -2204,20 +1968,12 @@ msgid "MySQL 4.0 compatible" msgstr "Compatible MySQL 4.0" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Générer un mot de passe" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Générer" @@ -2230,17 +1986,21 @@ msgstr "Créer une base de données" msgid "Create" msgstr "Créer" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Aucun privilège" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +msgid "Table must have at least one column." +msgstr "La table doit comporter au moins une colonne" + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Créer une nouvelle table sur la base %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 msgid "Number of columns" msgstr "Nombre de colonnes" @@ -2302,11 +2062,7 @@ msgid "remember template" msgstr "se souvenir du modèle" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Jeu de caractères du fichier:" @@ -2317,7 +2073,7 @@ msgstr "Compression" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Aucune" @@ -2364,11 +2120,7 @@ msgstr "" msgid "File to import" msgstr "Fichier à importer" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Emplacement du fichier texte" @@ -2376,20 +2128,12 @@ msgstr "Emplacement du fichier texte" msgid "File uploads are not allowed on this server." msgstr "Les téléchargements vers ce serveur ne sont pas permis." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Le répertoire de transfert est inaccessible" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "répertoire de transfert du serveur Web" @@ -2521,11 +2265,7 @@ msgstr "Trier sur l'index" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Options" @@ -2593,14 +2333,14 @@ msgstr "Affichage des enregistrements" msgid "total" msgstr "total" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Traitement en %01.4f sec." #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Modifier" @@ -2670,11 +2410,7 @@ msgstr "Utilisation de la mémoire-tampon" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Total" @@ -2967,11 +2703,7 @@ msgstr "" "plus anciens sont détruits, sinon ils sont renommés." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Format" @@ -3035,13 +2767,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Données" @@ -3090,15 +2817,9 @@ msgstr "Type MIME" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Serveur" @@ -3292,7 +3013,7 @@ msgstr "Exporter le contenu" msgid "Open new phpMyAdmin window" msgstr "Ouvrir une nouvelle fenêtre phpMyAdmin" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "Nouvelle table" @@ -3304,7 +3025,7 @@ msgstr "Résultat de la requête SQL" msgid "Generated by" msgstr "Généré par" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL n'a retourné aucun enregistrement." @@ -3451,20 +3172,20 @@ msgstr "Conversion en kana" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primaire" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Index" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Texte entier" @@ -3689,6 +3410,10 @@ msgstr "Ce format ne comporte pas d'options" msgid "not OK" msgstr "en erreur" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Activé" @@ -3711,7 +3436,7 @@ msgid "" msgstr "" "La documentation indique comment mettre à jour votre table Column_comments" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Requêtes en signets" @@ -3771,13 +3496,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Nom d'utilisateur" @@ -3794,22 +3514,14 @@ msgstr "État du maître" msgid "Slave status" msgstr "État de l'esclave" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Variable" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Valeur" @@ -3829,40 +3541,11 @@ msgstr "" msgid "Add slave replication user" msgstr "Ajouter un utilisateur pour la réplication vers l'esclave?" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Tout utilisateur" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Entrez une valeur" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Tout serveur" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Local" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Ce serveur" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Utiliser la table Host" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3886,7 +3569,6 @@ msgid "Use Host Table" msgstr "Utiliser la table Host" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3922,29 +3604,29 @@ msgstr "Langue inconnue: %1$s." msgid "Servers" msgstr "Serveurs" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Variables" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Jeux de caractères" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Moteurs" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Log binaire" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Processus" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Synchroniser" @@ -3971,49 +3653,49 @@ msgstr "Différence" msgid "Target database" msgstr "Base de données cible" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Exécuter une ou des requêtes SQL sur le serveur %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Exécuter une ou des requêtes sur la base %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 msgid "Columns" msgstr "Colonnes" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Conserver cette requête dans les signets" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Signet visible pour les autres utilisateurs" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Remplacer un signet existant du même nom" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Ne pas écraser cette requête depuis une autre fenêtre" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Délimiteur" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr "Afficher à nouveau la requête après exécution" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Exécuter" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Voir uniquement" @@ -4182,12 +3864,12 @@ msgstr "Définition de PARTITION" msgid "Save" msgstr "Sauvegarder" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, php-format msgid "Add %s column(s)" msgstr "Ajouter %s colonne(s)" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 msgid "You have to add at least one column." msgstr "Vous devez ajouter au moins une colonne." @@ -4363,8 +4045,8 @@ msgstr "Réinitialiser" msgid "Protocol version" msgstr "Version du protocole" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Utilisateur" @@ -4809,123 +4491,123 @@ msgstr "Moteurs de stockage" msgid "View dump (schema) of databases" msgstr "Schéma et/ou contenu des bases de données" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Tous les privilèges sauf GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Permission de modifier la structure des tables existantes." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Permission de modifier et de supprimer des procédures stockées." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Permission de créer des bases de données et des tables." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Permission de créer des procédures stockées." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Permission de créer des tables." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Permission de créer des tables temporaires." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Permission de créer, supprimer et renommer des comptes utilisateurs" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Permission de créer des vues." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Permission de détruire des données" -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Permission d'effacer des bases de données et des tables." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Permission d'effacer des tables." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" "Permission de mettre en place des événements pour le programmateur " "d'événements" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Permission d'exécuter des procédures stockées" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "" "Permission d'importer et d'exporter des données à partir de / dans des " "fichiers." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Permission d'ajouter des utilisateurs et des privilèges sans avoir besoin de " "recharger les privilèges." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Permission de créer et d'effacer des index." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Permission d'ajouter et de remplacer des données" -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "" "Permission de verrouiller des enregistrements dans le fil courant (unité " "d'exécution)." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Limite du nombre de nouvelles connexions qu'un utilisateur peut démarrer, " "par heure." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Limite du nombre de requêtes qu'un utilisateur peut envoyer au serveur, par " "heure." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4933,63 +4615,63 @@ msgstr "" "Limite du nombre de commandes changeant une table ou base de données, qu'un " "utilisateur peut exécuter, par heure." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "" "Limite le nombre de connexions simultanées autorisées pour un utilisateur." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Permission de voir les processus de tous les utilisateurs" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Non effectif dans cette version de MySQL." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Permission de recharger les réglages du serveur, et de vidanger la mémoire " "cache." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" "Permission de demander où sont les maîtres et les esclaves (système de " "duplication)." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Nécessaire pour les esclaves (système de duplication)." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Permission de lire des données." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Permission de voir la liste complète des noms de bases de données." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Permission d'exécuter SHOW CREATE VIEW." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Permission d'arrêter le serveur MySQL." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5000,153 +4682,153 @@ msgstr "" "administratif, par exemple les changements de variables globales ou la " "destruction de processus." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Permission de créer et de supprimer des déclencheurs" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Permission de changer des données." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Pas de privilèges" -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 msgctxt "None privileges" msgid "None" msgstr "Aucun" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Privilèges spécifiques à une table" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Veuillez noter que les noms de privilèges sont exprimés en anglais" -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Privilèges globaux" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Privilèges spécifiques à une base de données" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administration" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Limites de ressources." -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Note: Une valeur de 0 (zero) enlève la limite." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Information pour la connexion" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Conserver le mot de passe" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 msgid "No user found." msgstr "Aucun utilisateur n'a été trouvé." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "L'utilisateur %s existe déjà!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Vous avez ajouté un utilisateur" -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Vous avez modifié les privilèges pour %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Vous avez révoqué les privilèges pour %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Le mot de passe de %s a été changé." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Destruction de %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Aucun utilisateur n'a été choisi en vue de le détruire!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Chargement des privilèges en cours." -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Les utilisateurs sélectionnés ont été effacés." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Les privilèges ont été rechargés." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Changer les privilèges" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Révoquer" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Vue d'ensemble des utilisateurs" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr " «Grant »" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "N'importe quel" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Ajouter un utilisateur" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Effacer les utilisateurs sélectionnés." -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Effacer tous les privilèges de ces utilisateurs, puis les effacer." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "" "Supprimer les bases de données portant le même nom que les utilisateurs" -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5159,49 +4841,49 @@ msgstr "" "effectifs, si des changements manuels ont été apportés. Dans ce cas, vous " "devriez %srecharger les privilèges%s avant de continuer." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "L'utilisateur choisi n'existe pas dans la table des privilèges" -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Privilèges de colonnes" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Ajouter des privilèges sur cette base de données" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "Préfixer avec \\ les passepartouts _ et % pour un usage littéral" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Ajouter des privilèges sur cette table" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Changement des informations de connexion / Copie d'utilisateur" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Créer un nouvel utilisateur avec les mêmes privilèges et ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... conserver intact l'ancien utilisateur." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... supprimer l'ancien utilisateur." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... effacer tous les privilèges de l'ancien utilisateur, puis l'effacer." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5209,44 +4891,44 @@ msgstr "" " ... supprimer l'ancien utilisateur, puis recharger les privilèges au " "serveur." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Base de données pour cet utilisateur" -#: server_privileges.php:2060 +#: server_privileges.php:2037 msgctxt "Create none database for user" msgid "None" msgstr "Aucune" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" "Créer une base portant son nom et donner à cet utilisateur tous les " "privilèges sur cette base" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Donner les privilèges passepartout (utilisateur\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "Donner tous les privilèges sur la base de données "%s"" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Utilisateurs ayant accès à "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "global" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "spécifique à cette base de données" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "passepartout" @@ -8163,25 +7845,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "Identifiant de l'enregistrement inséré : %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Affichage du code PHP" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Affichage de la requête SQL" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Il y a des problèmes avec les index de la table `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Intitulé" @@ -8233,13 +7915,6 @@ msgstr "Sauvegarder un nouvel enregistrement (ignorer les erreurs)" msgid "Show insert query" msgstr "Afficher l'énoncé d'insertion" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "et ensuite" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Retourner à la page précédente" @@ -8320,7 +7995,7 @@ msgstr "(«PRIMARY» doit et ne peut être que le nom d'une clé primaire msgid "Add to index  %s column(s)" msgstr "Ajouter à l'index %s colonne(s)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Le nombre de champs doit être plus grand que zéro." @@ -8432,41 +8107,6 @@ msgstr "Vérifier l'intégrité référentielle" msgid "Show tables" msgstr "Afficher les tables" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Espace utilisé" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Espace" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "effectif" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Statistiques" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Information" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "statique" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dynamique" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Longueur enr." - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Espace utilisé" @@ -8500,7 +8140,6 @@ msgid "Row length" msgstr "Longueur enr." #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Taille enr. " @@ -8569,47 +8208,47 @@ msgstr "aucune" msgid "Column %s has been dropped" msgstr "La colonne %s a été effacée" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Une clé primaire a été ajoutée sur %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Un index a été ajouté sur %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Gestion des relations" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Suggérer des optimisations quant à la structure de la table" -#: tbl_structure.php:538 +#: tbl_structure.php:540 msgid "Add column" msgstr "Ajouter une colonne" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "En fin de table" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "En début de table" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Après %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, php-format msgid "Create an index on  %s columns" msgstr "Créer un index sur  %s colonnes" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "partitionné" @@ -8654,6 +8293,10 @@ msgstr "Enlevez les deux lignes suivantes si elles sont inutiles." msgid "SQL statements exported. Please copy the dump or execute it." msgstr "Énoncés SQL exportés. Vous pouvez copier le fichier ou l'exécuter." +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "Fermer" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/gl.po b/po/gl.po old mode 100755 new mode 100644 index 5f2672525..8da5a5098 --- a/po/gl.po +++ b/po/gl.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: galician \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Ver todos os rexistros" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Procurar" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Executar" @@ -114,7 +94,7 @@ msgstr "Usar este valor" msgid "Database %1$s has been created." msgstr "Creouse a base de datos %1$s." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Comentario da base de datos: " @@ -141,17 +121,10 @@ msgstr "Nomes das columnas" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Tipo" @@ -164,7 +137,7 @@ msgstr "Tipo" msgid "Null" msgstr "Nulo" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -188,24 +161,18 @@ msgstr "Vincúlase con" msgid "Comments" msgstr "Comentarios" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Non" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -214,15 +181,9 @@ msgstr "Non" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -241,141 +202,133 @@ msgstr "Ver o esquema do volcado da base de datos" msgid "No tables found in database." msgstr "Non se achou ningunha táboa na base de datos" -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Seleccionar todo" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Non seleccionar nada" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Ese nome de base de datos non existe." -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Mudóuselle o nome á base de datos %s para %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Copiuse a base de datos %s para %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Mudar o nome da base de datos para" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Orde" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "e despois" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Copiar a base de datos para" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Só a estrutura" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Estrutura e datos" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Só os datos" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREAR UNHA BASE DE DATOS antes de copiar" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Engadir %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Engadir o valor incremental (AUTO_INCREMENT)" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Engadir limitacións" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Pasar á base de datos copiada" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "Repositorio de BLOB" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Estado" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Activado" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Desactivar" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Danada" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair" msgctxt "BLOB repository" msgid "Repair" msgstr "Arranxar" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Desactivado" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Activar" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Orde alfabética" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -384,14 +337,14 @@ msgstr "" "Desactivouse a funcionalidade adicional para o traballo con táboas " "vinculadas. Para saber o por que, prema %saquí%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Editar as páxinas PDF" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -400,11 +353,7 @@ msgstr "Táboa" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Fileiras" @@ -412,42 +361,30 @@ msgstr "Fileiras" msgid "Size" msgstr "Tamaño" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "en uso" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Creación" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Actualización máis recente" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Comprobación máis recente" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -508,11 +445,7 @@ msgstr "Eliminar" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "ou" @@ -546,85 +479,85 @@ msgstr "Usar as táboas" msgid "SQL query on database %s:" msgstr "Procura tipo SQL na base de datos %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Enviar esta procura" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Denegouse o acceso" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "polo menos unha das palabras" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "todas as palabras" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "a frase exacta" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "como expresión regular" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Procurar os resultados para \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s ocorrencias(s) dentro da táboa %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Visualizar" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Eliminar" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Total: %s ocorrencia(s)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Procurar na base de datos" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Palabras(s) ou valore(s) a procurar (o comodín é: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Atopar:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "As palabras divídense cun carácter de espazo (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Dentro da(s) táboa(s):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -632,36 +565,36 @@ msgstr "No campo:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Inserir" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Estrutura" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Eliminar" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Borrar" @@ -671,25 +604,25 @@ msgstr "Borrar" msgid "Table %s has been emptied" msgstr "Vaciouse a táboa %s" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Deixouse a vista %s" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Eliminouse a táboa %s" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "O seguemento está activado." -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "O seguemento non está activado." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -698,92 +631,86 @@ msgstr "" "Esta vista ten, cando menos, este número de fileiras. Vexa a %sdocumentation%" "s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Vista" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replicación" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Suma" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s é o motor de almacenamento predefinido neste servidor de MySQL." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Todos os marcados" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Marcalos todos" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Quitarlles as marcas a todos" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Exceso na comprobación" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Visualización previa da impresión" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Verificar a táboa" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimizar a táboa" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Reparar a táboa" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analizar a táboa" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Exportar" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Dicionario de datos" @@ -794,10 +721,10 @@ msgstr "Táboas seguidas" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -817,8 +744,8 @@ msgstr "Actualizada" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Acción" @@ -852,8 +779,8 @@ msgstr "Instantánea da estrutura" msgid "Untracked tables" msgstr "Táboas non seguidas" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "Seguir a táboa" @@ -935,7 +862,7 @@ msgstr "Eliminouse o marcador." msgid "Showing bookmark" msgstr "A mostrar o marcador" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Creouse o marcador %s" @@ -1021,296 +948,187 @@ msgstr "O nome do servidor está vacío!" msgid "The user name is empty!" msgstr "O nome do usuario está vacío!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "O contrasinal está vacío!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Os contrasinais non son os mesmos." -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Engadir un usuario novo" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create version" -msgid "Create User" -msgstr "Crear unha versión" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Volver a cargar os privilexios" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Eliminar os usuarios seleccionados" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "Fechar" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Cancelar" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Cargar" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Procesos" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "Conforme" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Mudar o nome da base de datos para" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Base de datos" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Copiar a base de datos para" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Conxunto de caracteres" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "A táboa ha de ter, polo menos, un campo." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Crear táboas" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Procurar" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Gardáronse as modificacións" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Eliminouse a relación" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "Engadiuse unha relación cunha CHAVE EXTERNA" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Engadiuse a relación interna" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Erro: non se engadiu a relación." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Erro: xa existe unha relación." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Houbo un erro ao gardar as coordenadas para Deseñador." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Características xerais das relacións" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Desactivado" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Seleccionar a chave referida" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Escoller unha chave externa" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Escolla a chave primaria ou unha chave única" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Escolla o campo que quere que se mostre" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "Donate" msgid "Done" msgstr "Doar" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Anterior" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Seguinte" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Total" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr " Binario " -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Mar" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Abr" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Maio" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Xuño" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Xullo" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Ago" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Out" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Xan" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Feb" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Abr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1318,178 +1136,178 @@ msgid "May" msgstr "Maio" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Xuño" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Xullo" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Ago" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Set" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Out" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Nov" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Dec" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Do" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Lu" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Ma" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Ve" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Do" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Lu" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Ma" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Mé" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Xo" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Ve" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sá" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Do" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Lu" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Ma" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Mé" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Xo" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Ve" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Sá" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "Wiki" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "en uso" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1550,7 +1368,7 @@ msgstr "Índices" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Único" @@ -1568,7 +1386,7 @@ msgid "Comment" msgstr "Comentario" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1593,8 +1411,8 @@ msgstr "" "Parece que os índice %1$s e %2$s son iguais e posibelmente poderíase " "eliminar un deles" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Bases de datos" @@ -1769,11 +1587,7 @@ msgstr "Contrasinal:" msgid "Server Choice" msgstr "Escolla de servidor" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "A partir de aquí debe permitir cookies." @@ -1856,11 +1670,7 @@ msgstr "" "Non é posíbel usar nen iconv nen libiconv nen a función recode_stringf " "mentres haxa engadidos por cargar. Comprobe a configuración do php." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Se recibe unha " "páxina en branco é que todo está ben." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Non se puido cargar a configuración desde: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1898,49 +1700,29 @@ msgstr "" "A directiva $cfg['PmaAbsoluteUri'] DEBE estar asignada no seu " "ficheiro de configuración." -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "O índice do servidor non é válido: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" "O nome de servidor non é válido para o servidor %1$s. Revise a configuración." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Servidor" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Na configuración indicouse un método de autenticación que non válido::" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Na configuración indicouse un método de autenticación que non válido::" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Debería actualizar a %s %s ou posterior." @@ -1968,7 +1750,7 @@ msgstr "Enviado" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Documentación" @@ -1982,138 +1764,138 @@ msgstr "orde SQL" msgid "MySQL said: " msgstr "Mensaxes do MySQL: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Explicar SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Saltar a explicacion de SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "sen código PHP" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Crear código PHP" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Refrescar" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Omitir a validacion de" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Validar o SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Motores" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Análise do desempeño" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Tempo" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "B" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EiB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "." #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d de %B de %Y ás %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s días, %s horas, %s minutos e %s segundos" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Inicio" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Anterior" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Fin" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Saltar à base de datos "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "A función %s vese afectada por un erro descoñecido; consulte %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2133,7 +1915,7 @@ msgid "Events" msgstr "Acontecementos" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Nome" @@ -2161,15 +1943,15 @@ msgstr "Procurar cun exemplo" msgid "Designer" msgstr "Deseñador" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Importar" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privilexios" @@ -2188,11 +1970,7 @@ msgid "" msgstr "Pode non ser exacto. Consulte a FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "De máis (Overhead)" @@ -2211,7 +1989,7 @@ msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" "(ou o socket local do servidor de MySQL non se configurou correctamente)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Detalles..." @@ -2221,36 +1999,22 @@ msgid "Change password" msgstr "Trocar o contrasinal" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Sen contrasinal" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Contrasinal" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Reescribir" @@ -2265,20 +2029,12 @@ msgid "MySQL 4.0 compatible" msgstr "Compatíbel co MySQL 4.0" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Xerar un contrasinal" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Xerar" @@ -2291,17 +2047,23 @@ msgstr "Crear unha base de datos nova" msgid "Create" msgstr "Crear" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Sen privilexios" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "A táboa ha de ter, polo menos, un campo." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Crear unha táboa nova na base de datos %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2367,11 +2129,7 @@ msgid "remember template" msgstr "lembrar o modelo" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Conxunto de caracteres do ficheiro:" @@ -2382,7 +2140,7 @@ msgstr "Compresión" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Ningunha" @@ -2429,11 +2187,7 @@ msgstr "" msgid "File to import" msgstr "Ficheiro a importar" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Localización do arquivo de texto" @@ -2441,20 +2195,12 @@ msgstr "Localización do arquivo de texto" msgid "File uploads are not allowed on this server." msgstr "Este servidor non admite a recepción de ficheiros." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Non se pode acceder ao directorio que designou para os envíos" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "directorio de recepción do servidor web" @@ -2590,11 +2336,7 @@ msgstr "Ordenar pola chave" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Opcións" @@ -2664,14 +2406,14 @@ msgstr "A mostrar rexistros " msgid "total" msgstr "total" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "a pesquisa levou %01.4f segundos" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Mudar" @@ -2743,11 +2485,7 @@ msgstr "Uso da reserva da memoria intermedia" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Total" @@ -3037,11 +2775,7 @@ msgstr "" "o nome e dáselles o número máis alto seguinte." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Formato" @@ -3115,13 +2849,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Datos" @@ -3170,15 +2899,9 @@ msgstr "Tipo MIME" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Servidor" @@ -3373,7 +3096,7 @@ msgstr "Exportar o contido" msgid "Open new phpMyAdmin window" msgstr "Abrir unha xanela nova co phpMyAdmin" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Sen táboas" @@ -3386,7 +3109,7 @@ msgstr "Resultado SQL" msgid "Generated by" msgstr "Xerado por" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL retornou un conxunto vacío (ex. cero rexistros)." @@ -3537,20 +3260,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primaria" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Índice" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Texto completo" @@ -3775,6 +3498,10 @@ msgstr "Este formato non ten opcións" msgid "not OK" msgstr "non conforme" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "Conforme" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Activado" @@ -3797,7 +3524,7 @@ msgid "" msgstr "" "Consulte a documentación para saber como actualizar a táboa Column_comments" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Gardouse a procura de SQL" @@ -3851,13 +3578,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Nome do usuario" @@ -3874,22 +3596,14 @@ msgstr "Estado do mestre" msgid "Slave status" msgstr "Estado do escravo" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Variábel" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Valor" @@ -3909,40 +3623,11 @@ msgstr "" msgid "Add slave replication user" msgstr "Engadir un usuario de replicación de escravos" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Calquera usuario" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Use campo de texto" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Calquera servidor" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Local" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Este servidor" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Usar a táboa de Host" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3966,7 +3651,6 @@ msgid "Use Host Table" msgstr "Usar a táboa de Host" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -4002,29 +3686,29 @@ msgstr "Linguaxe descoñecida: %1$s." msgid "Servers" msgstr "Servidores" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Variábeis" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Conxuntos de caracteres" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Motores" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Ficheiro de rexistro binario" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Procesos" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Sincronizar" @@ -4051,51 +3735,51 @@ msgstr "Diferenza" msgid "Target database" msgstr "Base de datos de destino" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Executar procura/s SQL no servidor %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Efectuar unha procura SQL na base de datos %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Nomes das columnas" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Gardar esta procura de SQL" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Permitir que calquera usuario poida acceder a este marcador" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Substituír un marcador xa existente que teña o mesmo nome" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Non escribir sobre esta procura desde fóra da xanela" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Delimitador" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Mostrar esta procura aquí outra vez " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Enviar" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Só visualizar" @@ -4274,13 +3958,13 @@ msgstr "Definición da PARTICIÓN" msgid "Save" msgstr "Gardar" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add column(s)" msgid "Add %s column(s)" msgstr "Engadir columna(s)" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4494,8 +4178,8 @@ msgstr "Reiniciar" msgid "Protocol version" msgstr "Versión do protocolo" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Usuario" @@ -4957,112 +4641,112 @@ msgstr "Motores de almacenamento" msgid "View dump (schema) of databases" msgstr "Ver o volcado das bases de datos" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Inclúe todos os privilexios a excepción de GRANT (Conceder)." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Permite alterar a estrutura das táboas xa existentes." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Permite alterar e eliminar rutinas armacenadas." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Permite crear bases de datos e táboas novas." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Permite crear rutinas almacenadas." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Permite crear táboas novas." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Permite crear táboas temporais." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Permite crear, eliminar e mudar o nome das contas de usuario." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Permite crear vistas novas." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Permite eliminar datos." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Permite eliminar bases de datos e táboas." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Permite eliminar táboas." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Permite configurar acontecementos para o programador de acontecementos" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Permite executar rutinas almacenadas." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Permite importar e exportar datos desde e para ficheiros." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Permite engadir usuarios e privilexios sen recargar as táboas de privilexios." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Permite crear e eliminar índices." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Permite inserir e substituír datos." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Permite bloquear táboas do fío en uso" -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Limita o número de conexións novas por hora que pode abrir un usuario." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Limita o número de procuras por hora que pode enviar un usuario." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5070,58 +4754,58 @@ msgstr "" "Limita o número de ordes que modifiquen unha táboa ou base de datos por hora " "que pode executar un usuario." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Limita o número de conexións simultáneas que pode ter o usuario." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Permite ver procesos de todos os usuarios" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Non funciona nesta versión do MySQL." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "Permite recargar a configuración do servidor e limpar a súa caché." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Permite que o usuario pregunte onde están os escravos e os masters." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Necesario para os escravos de replicación." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Permite gravar datos." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Permite acceder á listaxe completa de bases de datos" -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Permite realizar consultas SHOW CREATE VIEW." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Permite apagar o servidor." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5131,158 +4815,158 @@ msgstr "" "maioría das operación administrativas, como configurar as variábeis globais " "ou matar os fíos doutros usuarios." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Permite crear e eliminar os disparadores" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Permite modificar datos." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Sen privilexios." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Ningunha" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Privilexios propios de táboa" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Nota: os nomes de privilexios do MySQL están en inglés" -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Privilexios globais" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Privilexios propios de base de datos" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administración" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Limites de recursos" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Nota: Se estas opcións se configuran como 0 (cero) elimínase o límite." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Información sobre o acceso (login)" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Non mude o contrasinal" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Non se achou ningún usuario." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Xa existe o usuario %s" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Engadiuse o usuario." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Acaba de actualizar os privilexios de %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Retiroulle os privilexios a %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Modificouse sen problemas o contrasinal de %s." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "A eliminar %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Non se seleccionaron utilizadores para eliminar!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "A recargar os privilexios" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Elimináronse sen problemas os usuarios seleccionados." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Non houbo problemas ao recargar os privilexios." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Modificar privilexios" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Revogar" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Vista xeral dos usuarios" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Conceder" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Calquera" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Engadir un usuario novo" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Eliminar os usuarios seleccionados" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Retirarlles todos os privilexios activos aos usuarios e eliminalos a " "continuación." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Eliminar as bases de datos que teñan os mesmos nomes que os usuarios." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5295,51 +4979,51 @@ msgstr "" "privilexios que usa o servidor se se levaron a cabo alteracións manuais. " "Neste caso, debería %svolver a cargar os privilexios%s antes de proseguir." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Non se atopou o usuario seleccionado na táboa de privilexios." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Privilexios propios de columna" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Engadir privilexios para esta base de datos" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Os caracteres comodín _ e % deberíanse escapar con \\ para podelos usar " "literalmente" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Engadir privilexios para a esta táboa" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Modificar a información de acceso (login) / Copiar o utilizador" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Crear un utilizador novo cos mesmos privilexios e..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... manter o anterior." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... eliminar o anterior das táboas de utilizadores." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... retirarlle todos os privilexios activos ao anterior e eliminalo despois." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5347,44 +5031,44 @@ msgstr "" " ... eliminar o anterior das táboas de utilizadores e recargar os " "privilexios despois." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Base de datos para o usuario" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Ningunha" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Crear unha base de datos co mesmo nome e conceder todos os privilexios" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Conceder todos os privilexios para o nome con comodíns (username\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "Conceder todos os privilexios sobre a base de datos "%s"" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Usuarios que teñen acceso a "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "global" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "específico da base de datos" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "comodín" @@ -8387,25 +8071,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "Identificador da fileira inserida: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Mostrar como código PHP" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Mostrar procura SQL" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Problemas cos índices da táboa `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Nome" @@ -8458,13 +8142,6 @@ msgstr "" msgid "Show insert query" msgstr "Mostrar procura SQL" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "e despois" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Voltar" @@ -8546,7 +8223,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Engadir ao índice  %s coluna(s)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "O número de columnas ten que ser maior de cero" @@ -8660,41 +8337,6 @@ msgstr "Comprobar a integridade das referencias:" msgid "Show tables" msgstr "Mostrar as táboas" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Uso do espazo" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Uso" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Efectivo" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Estatísticas da fileira" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Informacións" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "estático" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinámico" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Lonxitude da fileira" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Uso do espazo" @@ -8728,7 +8370,6 @@ msgid "Row length" msgstr "Lonxitude da fileira" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Tamaño da fileira " @@ -8805,50 +8446,50 @@ msgstr "Ningunha" msgid "Column %s has been dropped" msgstr "Eliminouse a táboa %s" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Engadiuse unha chave primaria a %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Engadiusese un índice a %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Vista das relacións" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Propor unha estrutura para a táboa" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add column(s)" msgid "Add column" msgstr "Engadir columna(s)" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Ao final da táboa" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "No comezo da táboa" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Despois de %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Crear un índice en %s colunas" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "particionado" @@ -8890,6 +8531,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "Declaracións SQL exportadas. Copie o volcado ou execúteo." +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "Fechar" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -9340,6 +8985,9 @@ msgstr "Mudar o nome da táboa para" #~ msgid "Process list" #~ msgstr "Listaxe dos procesos" +#~ msgid "Reload privileges" +#~ msgstr "Volver a cargar os privilexios" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/he.po b/po/he.po old mode 100755 new mode 100644 index aa88df969..f8d32ddf9 --- a/po/he.po +++ b/po/he.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:15+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: hebrew \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "ראיית הכל" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -38,53 +34,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "חיפוש" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "סע" @@ -110,7 +90,7 @@ msgstr "השתמש בערך זה" msgid "Database %1$s has been created." msgstr "מסד הנתונים %s נמחק." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "הערה על מאגר הנתונים: " @@ -137,17 +117,10 @@ msgstr "שמות עמודה" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "סוג" @@ -160,7 +133,7 @@ msgstr "סוג" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -184,24 +157,18 @@ msgstr "קישורים אל" msgid "Comments" msgstr "הערות" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "לא" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -210,15 +177,9 @@ msgstr "לא" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -237,142 +198,134 @@ msgstr "ראיית הוצאה (תבנית) של מאגר נתונים" msgid "No tables found in database." msgstr "לא נמצאו טבלאות במאגר נתונים." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "בחירת הכל" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "בטל בחירת הכל" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "שם מאגר הנתונים ריק!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "מאגר נתונים %s שונה אל %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "מאגר נתונים %s הועתק אל %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "שינוי שם מאגר נתונים אל" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "פקודה" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "ואז" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "העתקת מאגר נתונים אל" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "מבנה בלבד" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "מבנה ומידע" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "מידע בלבד" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREATE DATABASE לפני העתקה" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "הוספת ערך AUTO_INCREMENT (מספור אוטומטי)" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "הוספת הגבלות" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "מעבר למאגר נתונים שהועתק" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "מצב" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "מופעל" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "מבוטל" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "תיקון טבלה" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "מבוטל" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "מופעל" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "קידוד" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -380,14 +333,14 @@ msgid "" msgstr "" "תכונות נוספות לעבודה עם טבלאות מקושרות בוטלו. לעוד מידע למה לחץ %sכאן%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "עריכת דפי PDG" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -396,11 +349,7 @@ msgstr "טבלה" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "שורות" @@ -408,42 +357,30 @@ msgstr "שורות" msgid "Size" msgstr "גודל" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "בשימוש" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "יצירה" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "עדכון אחרון" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "נבדק לאחרונה" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -504,11 +441,7 @@ msgstr "מחיקה" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "או" @@ -542,85 +475,85 @@ msgstr "השתמש בטבלאות" msgid "SQL query on database %s:" msgstr "" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "שליחת שאילתה" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "גישה נדתחה" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "לפחות אחת מן המילים" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "כל המילים" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "הביטוי המדוייק" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "כביטוי רגיל" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "תוצאות חיפוש עבור \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "עיון" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "מחיקה" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "סה\"כ: %s פריטים" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "חפש במסד הנתונים" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "מילים או ערכים עבור חיפוש (תו כללי: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "מצא:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "מילים מופרדות ע\"י תו רווח (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "בתוך הטבלה/הטבלאות:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -628,36 +561,36 @@ msgstr "בתוך הטבלה/הטבלאות:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "הכנסה" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "מבנה" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "הסרה" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "ריקון" @@ -667,118 +600,112 @@ msgstr "ריקון" msgid "Table %s has been emptied" msgstr "טבלה %s רוקנה" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, fuzzy, php-format msgid "View %s has been dropped" msgstr "שדה %s נמחק" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "טבלה %s נמחקה" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 #, fuzzy msgid "Replication" msgstr "יחסים" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "סכום" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s הוא מנוע האחסון ברירת המחדשל של שרת MySQL זה." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "עם הנבחרים:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "בחירת הכל" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "בטל סימון הכל" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "בדיקת טבלאות עבור תקורה" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "תצוגת הדפסה" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "בדיקת טבלה" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "ייעול טבלה" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "תיקון טבלה" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "ניתוח טבלה" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "ייצוא" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "מילון מידע" @@ -789,10 +716,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -813,8 +740,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "פעולה" @@ -850,8 +777,8 @@ msgstr "מבנה בלבד" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "בדיקת טבלה" @@ -926,7 +853,7 @@ msgstr "כתובת מועדפת נמחקה." msgid "Showing bookmark" msgstr "" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "" @@ -1005,294 +932,189 @@ msgstr "שם המארח ריק!" msgid "The user name is empty!" msgstr "שם המשתמש ריק !" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "הסיסמא ריקה!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "הסיסמאות אינן זהות!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "הוספת משתמש חדש" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "גרסת שרת" - -#: js/messages.php:48 -#, fuzzy -msgid "Reloading Privileges" -msgstr "הרשאות גלובליות" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "הסרת משתמשים שנבחרו" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "מקומי" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "תהליכים" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "אישור" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "שינוי שם מאגר נתונים אל" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "מאגר נתונים" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "העתקת מאגר נתונים אל" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "קידוד" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "טבלה חייבית להכיל לפחות שדה אחד." - -#: js/messages.php:70 -#, fuzzy -msgid "Create Table" -msgstr "יצירת עמוד חדש" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "חיפוש" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "שינויים נשמרו" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 #, fuzzy msgid "Relation deleted" msgstr "תצוגת יחסים" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 #, fuzzy msgid "Internal relation added" msgstr "יחסים פנימיים" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "תכונות קשר כלליות" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "מבוטל" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "בחירת שדה להצגה" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "ללא" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "הקודם" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "הבא" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "סה\"כ" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "בינארי" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "מרץ" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "אפריל" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "מאי" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "יוני" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "יולי" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "אוגוסט" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "אוקטובר" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "ינואר" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "פברואר" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "מרץ" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "אפריל" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1300,176 +1122,176 @@ msgid "May" msgstr "מאי" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "יוני" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "יולי" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "אוגוסט" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "ספטמבר" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "אוקטובר" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "נובמבר" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "דצמבר" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "יום ראשון" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "יום שני" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "יום שלישי" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "יום שישי" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "יום ראשון" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "יום שני" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "יום שלישי" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "יום רביעי" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "יום חמישי" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "יום שישי" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "שבת" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "יום ראשון" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "יום שני" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "יום שלישי" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "יום רביעי" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "יום חמישי" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "יום שישי" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "שבת" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "בשימוש" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1527,7 +1349,7 @@ msgstr "אינדקסים" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "ייחודי" @@ -1546,7 +1368,7 @@ msgid "Comment" msgstr "הערות" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1569,8 +1391,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "מאגרי נתונים" @@ -1737,11 +1559,7 @@ msgstr "סיסמא:" msgid "Server Choice" msgstr "בחירת שרת" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "עוגיות (Cookies) חייבות לפעול מנקודה זאת." @@ -1820,11 +1638,7 @@ msgstr "" "נכשל בשימוש בפונקציות iconv, libiconv או recode, למרות שזה נראה כי התוספות " "הדרושות נטענו. בדוק את הגדרות PHP שלך." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
אם הינך מקבל דף ריק, הכל בסדר." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "שרת" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "אתה צריך לשדרג אל %s %s לפחות." @@ -1925,7 +1711,7 @@ msgstr "נשלח" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "תיעוד" @@ -1939,139 +1725,139 @@ msgstr "שאילתת SQL" msgid "MySQL said: " msgstr "MySQL אמר: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "הסברת SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Skip Explain SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "ללא קוד PHP" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "ייצור קוד PHP" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "רענון" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 #, fuzzy msgid "Skip Validate SQL" msgstr "בדיקת תקינות SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "בדיקת תקינות SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "מנועים" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "זמן" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Bytes" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%B %d, %Y at %I:%M %p" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s ימים, %s שעות, %s דקות ו- %s שניות" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "התחלה" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "הקודם" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "סיום" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "קפיצה אל מאגר נתונים "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2090,7 +1876,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "שם" @@ -2118,16 +1904,16 @@ msgstr "שאילתה" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 #, fuzzy msgid "Import" msgstr "ייצוא" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "הרשאות" @@ -2146,11 +1932,7 @@ msgid "" msgstr "יכול להיות הערכה. ראה FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "תקורה" @@ -2167,7 +1949,7 @@ msgstr "השרת אינו מגיב" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2177,36 +1959,22 @@ msgid "Change password" msgstr "שינוי סיסמא" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "ללא סיסמא" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "סיסמא" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "הקלדה נוספת" @@ -2221,20 +1989,12 @@ msgid "MySQL 4.0 compatible" msgstr "תואם MySQL 4.0" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "ייצור סיסמא" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "ייצור" @@ -2247,17 +2007,23 @@ msgstr "יצירת מאגר נתונים חדש" msgid "Create" msgstr "יצירה" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "ללא הרשאות" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "טבלה חייבית להכיל לפחות שדה אחד." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "יצירת טבלה חדשה על מאגר נתונים %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2320,11 +2086,7 @@ msgid "remember template" msgstr "זכור תבנית" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "חבילת הקידוד של הקובץ:" @@ -2335,7 +2097,7 @@ msgstr "דחיסה" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "ללא" @@ -2377,11 +2139,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "מיקום של קובץ טקסט" @@ -2389,20 +2147,12 @@ msgstr "מיקום של קובץ טקסט" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 #, fuzzy msgid "web server upload directory" @@ -2532,11 +2282,7 @@ msgstr "" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "פעולות" @@ -2608,14 +2354,14 @@ msgstr "מראה שורות" msgid "total" msgstr "סה\"כ" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "שאילתה לקחה %01.4f שניות" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "שינוי" @@ -2681,11 +2427,7 @@ msgstr "" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "סה\"כ" @@ -2931,11 +2673,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "תבנית" @@ -3005,13 +2743,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "נתונים" @@ -3060,15 +2793,9 @@ msgstr "סוג MIME" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "מארח" @@ -3268,7 +2995,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "אין טבלאות" @@ -3281,7 +3008,7 @@ msgstr "תוצאת SQL" msgid "Generated by" msgstr "נוצר ע\"י" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL החזיר חבילת תוצאות ריקה (לדוגמא, אפס שורות)." @@ -3428,20 +3155,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "ראשי" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "אינדקס" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Fulltext" @@ -3666,6 +3393,10 @@ msgstr "לתבנית זאת אין אפשרויות" msgid "not OK" msgstr "לא בסדר" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "אישור" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "מופעל" @@ -3687,7 +3418,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "שאילתות SQL מועדפות" @@ -3738,13 +3469,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "שם משתמש" @@ -3762,22 +3488,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "משתנה" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "ערך" @@ -3795,40 +3513,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "כל משתמש" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "השתמש בשדה טקסט" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "כל שרת מארח" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "מקומי" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "מארח זה" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Use Host Table" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3852,7 +3541,6 @@ msgid "Use Host Table" msgstr "Use Host Table" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3887,29 +3575,29 @@ msgstr "" msgid "Servers" msgstr "שרת" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "משתנים" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "קידודים" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "מנועים" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "דו\"ח בינארי" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "תהליכים" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3938,51 +3626,51 @@ msgstr "" msgid "Target database" msgstr "חפש במסד הנתונים" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, fuzzy, php-format msgid "Run SQL query/queries on server %s" msgstr "הרצת את שאילתה/שאילתות על מסד הנתונים %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "הרצת את שאילתה/שאילתות על מסד הנתונים %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "שמות עמודה" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "הכנס שאילתת SQL זאת למועדפים" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "אפשר לכל משתמש לגשת לכתובת מועדפת זאת" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "אל תכתוב מחדש על שאילתה זאת מחוץ לחלון זה" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " הראה את שאילתה כאן שוב " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "שליחה" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "ראה רק" @@ -4144,13 +3832,13 @@ msgstr "" msgid "Save" msgstr "שמירה" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "הוספת %s תאים" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4286,8 +3974,8 @@ msgstr "איפוס" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "משתמש" @@ -4723,331 +4411,331 @@ msgstr "מנועי אחסון" msgid "View dump (schema) of databases" msgstr "ראיית הוצאה (תבנית) של מאגרי נתונים" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "כלול כל ההרשאות חוץ מ- GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "מאפשר שינוי של מבני הטבלאות הקיימות." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 #, fuzzy msgid "Allows altering and dropping stored routines." msgstr "מאפשר יצירת שגרות מאוחסנות." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 #, fuzzy msgid "Allows creating new databases and tables." msgstr "מאפשר מחיקת מאגרי נתונים וטבלאות." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "מאפשר יצירת שגרות מאוחסנות." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "מאפשר יצירת טבלאות חדשות." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "מאפשר יצירת טבלאות זמניות." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 #, fuzzy msgid "Allows creating new views." msgstr "מאפשר יצירת טבלאות חדשות." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "מאפשר מחיקת מידע." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "מאפשר מחיקת מאגרי נתונים וטבלאות." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "מאפשר מחיקת טבלאות." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 #, fuzzy msgid "Allows executing stored routines." msgstr "מאפשר יצירת שגרות מאוחסנות." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "" -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "" -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "" -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "" -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." msgstr "" -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "" -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "" -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "" -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 #, fuzzy msgid "Allows reading data." msgstr "מאפשר מחיקת מידע." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "" -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "" -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " "killing threads of other users." msgstr "" -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 #, fuzzy msgid "Allows changing data." msgstr "מאפשר מחיקת מידע." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "ללא הרשאות." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "ללא" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "הרשאות ספציפיות-לטבלאות" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " הערה: שמות הרשאות MySQL מובטאות באנגלית " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "הרשאות גלובליות" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "הרשאות ספציפיות למאגר נתונים" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "ניהול" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "גבולות משאבים" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "הערה: הגדרת אפשרויות אלו אל 0 (אפס) יבטלו את ההגבלה." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "מידע כניסה" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "אל תשנה את הסיסמא" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "לא נמצאו משתמשים." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "שם המשתמש %s כבר קיים!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "משתמש חדש נוסף." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "אתה עדכנת הרשאות עבור %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "אתה שללת הרשאות עבור %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "הסיסמא עבור %s שונתה בהצלחה." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "מוחק %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "טוען מחדש הרשאות" -#: server_privileges.php:1301 +#: server_privileges.php:1300 #, fuzzy msgid "The selected users have been deleted successfully." msgstr "%s מסדי נתונים נמחקו בהצלחה." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "ההרשאות נטענו מחדש בהצלחה." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "עריכת הרשאות" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "שלילה" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "סקירת משתמשים" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "הענקה" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "כל דבר" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "הוספת משתמש חדש" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "הסרת משתמשים שנבחרו" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "שלילת כל ההרשאות הפעילות מהמשתמשים ומחיקתם לאחר מכן." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "הסרת מאגרי נתונים שיש להם שמות דומים כמו למשתמשים." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5059,91 +4747,91 @@ msgstr "" "הטבלאות האלו יכול להיות שונה מההרשאות שהשרת משתמש בהן, אם הן שונו באופן " "ידני. במקרה זה, אתה צריך לבצע %sטעינה מחדש של הרשאות%s לפני שאתה ממשיך." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "המשתמש שנבחר לא נמצא בטבלת ההרשאות." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "הרשאות ספציפיות-לעמודה" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "הוספת הרשאות למאגר הנתונים הבא" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "תווים כללים _ וגם % צריכים לבוא ביחד עם \\ על מנת להשתמש בהם באמת" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "הוספת הראשאות לטבלה הבאה" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "שינוי מידע כניסה / העתקת משתמש" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "יצירת משתמש חדש עם אותן ההרשאות וגם ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... שמירת הישן." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... מחיקת הישן מטבלאות המשתמשים." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... בטל את כל ההרשאות הפעילות מהישן ומחק אותו לאחר מכן." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr " ... מחיקת הישן מטבלאות המשתמשים וטען מחדש את ההרשאות לאחר מכן." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "ללא" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "בדיקת הראשות עבור מאגר נתונים "%s"." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "עולמי" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "ספציפי למאגר הנתונים" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "תו כללי" @@ -7761,25 +7449,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "בעיות עם אינדקסים של טבלה `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "תווית" @@ -7831,13 +7519,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "ואז" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "חזרה לעמוד הקודם" @@ -7916,7 +7597,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "הוספה לאינדקס  %s שורה/שורות" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "מספר העמודות צריך להיות גדול מאפס." @@ -8034,41 +7715,6 @@ msgstr "" msgid "Show tables" msgstr "ראיית טבלאות" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "שימוש מקום" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "שימוש" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "יעיל" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "סטטיסטיקת שורה" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "משפטים" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "דינאמי" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "אורך שורה" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "שימוש מקום" @@ -8102,7 +7748,6 @@ msgid "Row length" msgstr "אורך שורה" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " גודל שורה " @@ -8175,50 +7820,50 @@ msgstr "ללא" msgid "Column %s has been dropped" msgstr "טבלה %s נמחקה" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "מפתח ראשי נוסף אל %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "אינדקס נוסף אל %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "תצוגת יחסים" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "הצעת מבנה טבלה" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "הוספת %s תאים" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "בסוף טבלה" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "בתחילת טבלה" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "לאחר %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "יצירת אינדקס על %s  עמודות" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8260,6 +7905,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8564,6 +8213,10 @@ msgstr "שינוי שם טבלה אל" #~ msgid "Process list" #~ msgstr "רשימת תהליכים" +#, fuzzy +#~ msgid "Reload privileges" +#~ msgstr "הרשאות גלובליות" + #~ msgid "Native MS Excel format" #~ msgstr "תבנית MS Excel טבעית" diff --git a/po/hi.po b/po/hi.po old mode 100755 new mode 100644 index 5ca7225c7..b02267f7c --- a/po/hi.po +++ b/po/hi.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-05-21 05:48+0200\n" "Last-Translator: \n" "Language-Team: hindi \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "सभी दिखाओ" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "खोजें" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "आगे" @@ -113,7 +93,7 @@ msgstr "इस मूल्य का उपयोग करें" msgid "Database %1$s has been created." msgstr "%1$s डेटाबेस बनाया गया है." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "डाटाबेस टिप्पणि: " @@ -140,17 +120,10 @@ msgstr "कोलम के नाम" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "टाइप" @@ -163,7 +136,7 @@ msgstr "टाइप" msgid "Null" msgstr "अशक्त" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -187,24 +160,18 @@ msgstr "के लिए लिंक" msgid "Comments" msgstr "टिप्पणी" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "नहीं" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -213,15 +180,9 @@ msgstr "नहीं" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -240,135 +201,127 @@ msgstr "डेटाबेस का डंप (स्कीमा) दिखा msgid "No tables found in database." msgstr "डाटाबेस में कोई टेबल नहीं।" -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "सभी का चयन करें" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "सभी को रद्द करें" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "डेटाबेस नाम खाली है" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr " डेटाबेस का नाम %s बदल कर %s रखा गया है" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr " डेटाबेस %s से %s में कॉपी किया गया है" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "डेटाबेस का नाम बदल कर ____ रखें" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "आदेश" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "और फिर" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "डेटाबेस को ______ में कॉपी करें" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "केवल संरचना" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "संरचना और डाटा" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "केवल डाटा" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "डेटाबेस कॉपी करने से पहले डेटाबेस का निर्माण करें" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "%s जोडें" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "AUTO_INCREMENT मूल्य जोडें" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "शर्तें जोडें" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "नक़ल किये गए डाटाबेस पर जायें" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "BLOB भंडार गृह" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "स्थिति" -#: db_operations.php:559 +#: db_operations.php:548 msgctxt "BLOB repository" msgid "Enabled" msgstr "सक्षम" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "असक्षम" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "क्षतिग्रस्त" -#: db_operations.php:577 +#: db_operations.php:566 msgctxt "BLOB repository" msgid "Repair" msgstr "मरम्मत" -#: db_operations.php:585 +#: db_operations.php:574 msgctxt "BLOB repository" msgid "Disabled" msgstr "असक्षम" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "सक्षम" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "क्रम में करें" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -377,14 +330,14 @@ msgstr "" "लिंक्ड तालिकाओं के साथ काम करने के लिए अतिरिक्त सुविधाओं को निष्क्रिय कर दिया गया है. " "क्यों ये किया गया है, जानने के लिए %shere%s पर क्लिक करें." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "पीडीएफ पृष्ठों को संपादित करें" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -393,11 +346,7 @@ msgstr " टेबल " #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "" @@ -405,42 +354,30 @@ msgstr "" msgid "Size" msgstr "आकार" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "उपयोग में" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "रचना" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "पिछला नवीनीकरण" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "पिछली जाँच" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -501,11 +438,7 @@ msgstr "हटाइए" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "अथवा" @@ -539,85 +472,85 @@ msgstr "टेबल का उपयोग करो" msgid "SQL query on database %s:" msgstr "डेटाबेस %s पर SQL प्रश्न:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "प्रश्न प्रस्तुत करें" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "प्रवेश निषेध" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "कोई भी एक शब्द" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "सभी शब्द" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "यथार्थ वाक्यांश" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "नियमित अभिव्यक्ति के रूप में" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "%s %s के लिये परिणाम खोजें:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s तालिका के अंदर %s मैच हैं." -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "ब्राउज़" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "मिटाएँ" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "कुल: %s मैच" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "डाटाबेस में खोजें" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "शब्द अथवा वेल्यु जिसे सर्च करना है (wildcard: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "खोजो:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "शब्द स्पेस(\" \") करक्टेर से अलग किये गए हैं." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr " टेबल में:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -625,36 +558,36 @@ msgstr "क्षेत्र के अंदर:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "इनसर्ट" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "संरचना" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "छोड़ें" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "खाली करें" @@ -664,117 +597,111 @@ msgstr "खाली करें" msgid "Table %s has been emptied" msgstr " टेबल %s को खाली किया गया है." -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "द्रश्य %s रद्द दिया गया है." -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr " टेबल %s को रद्द किया गया है." -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "ट्रैकिंग सक्रिय है" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "ट्रैकिंग सक्रिय नहीं है." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "इस द्रश्य में कम से कम इतनी पंक्तियाँ हैं. और जानने के लिए %s दोक्युमेंताशन%s पढ़ें." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "दृश्य" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "प्रतिकृति" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "जोड" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s इस MySQL सर्वर पर डिफ़ॉल्ट भंडारण इंजन है." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "चुने हुओं को:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "सभी को चेक करें" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr " सभी को अनचेक करें" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr " ओवर्हेअद वाली तालुकाओं को चेक करें." -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "छापने वाला द्रश्य." -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr " टेबल को चेक करें" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "तालिका को अनुकूलित करें" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr " टेबल को टीक करें" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "टेबल का विश्लेषण करें" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "निर्यात" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "डेटा शब्दकोश" @@ -785,10 +712,10 @@ msgstr "ट्रैक की गयी तालिकाएं" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -808,8 +735,8 @@ msgstr "अद्यतन" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "कार्य" @@ -843,8 +770,8 @@ msgstr "संरचना स्नैपशॉट" msgid "Untracked tables" msgstr "लापता तालिकाएं" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "तालिकाओं को ट्रैक करें" @@ -925,7 +852,7 @@ msgstr "यह बुकमार्क हटा दिया गया है" msgid "Showing bookmark" msgstr "बुकमार्क प्रदर्शित किया जा रहा है." -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "बुकमार्क %s बनाया" @@ -1007,421 +934,318 @@ msgstr "मेज़बान का नाम (hostname) खाली है!" msgid "The user name is empty!" msgstr "उपयोगकर्ता नाम खाली है!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "पासवर्ड खाली है" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "पासवर्ड मिलते झूलते नहीं हैं." -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "नया यूसर जोडें" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create" -msgid "Create User" -msgstr "बनाइये" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Edit Privileges" -msgid "Reloading Privileges" -msgstr " प्रिविलेज एडिट करें" - -#: js/messages.php:49 -msgid "Removing Selected Users" -msgstr "" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "रद्द" -#: js/messages.php:57 -#, fuzzy -#| msgid "Log in" -msgid "Loading" -msgstr "लोगिन" - -#: js/messages.php:58 -msgid "Processing Request" -msgstr "" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "डेटाबेस का नाम बदल कर ____ रखें" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr " डाटाबेस" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "डेटाबेस को ______ में कॉपी करें" - -#: js/messages.php:68 -msgid "Changing Charset" -msgstr "" - -#: js/messages.php:69 -#, fuzzy -#| msgid "You have to choose at least one column to display" -msgid "Table must have atleast 1 column" -msgstr "आपको कम से कम एक स्तंभ प्रदर्शित करने के लिए चयन करना है." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create a page" -msgid "Create Table" -msgstr "नया पेज़ बनाऐं" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "खोजें" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "संशोधनों को बचाया गया है" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "रिश्ते को नष्ट कर दिया" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "विदेशी कुंजी रिश्ता जोड़ा." -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "आंतरिक संबंध जोड़ा." -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "त्रुटि: रिलेशन नहीं जोड़ा गया." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "त्रुटि: रिश्ता पहले से ही मौजूद है. " -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "डिजाइनर के लिए निर्देशांक बचाने में त्रुटि आ रही है" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "सामान्य सुविधाओं के संबंध" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "अक्षम" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "संदर्भित कुंजी का चयन करें." -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "विदेश कुंजी का चयन करें." -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "कृपया प्राथमिक कुंजी या एक अद्वितीय कुंजी का चयन करें" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "क्षेत्र प्रदर्शित करने के लिए चयन करें." #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 msgid "Done" msgstr "किया" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 msgid "Prev" msgstr "पिछला" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr " अगला" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 msgid "Today" msgstr "आज" -#: js/messages.php:111 +#: js/messages.php:82 msgid "January" msgstr "जनवरी" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "फरवरी" -#: js/messages.php:113 +#: js/messages.php:84 msgid "March" msgstr "मार्च" -#: js/messages.php:114 +#: js/messages.php:85 msgid "April" msgstr "अप्रैल" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "मई" -#: js/messages.php:116 +#: js/messages.php:87 msgid "June" msgstr "जून" -#: js/messages.php:117 +#: js/messages.php:88 msgid "July" msgstr "जुलाई" -#: js/messages.php:118 +#: js/messages.php:89 msgid "August" msgstr "अगस्त" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "सितम्बर" -#: js/messages.php:120 +#: js/messages.php:91 msgid "October" msgstr "अक्तूबर" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "नवम्बर" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "दिसम्बर" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "जनवरी" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "फरवरी" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "मार्च" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "अप्रैल" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 msgctxt "Short month name" msgid "May" msgstr "मई" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "जून" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "जुलाई" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "अगस्त" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "सितम्बर" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "अक्तूबर" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "नवम्बर" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "दिसमबर" -#: js/messages.php:151 +#: js/messages.php:122 msgid "Sunday" msgstr "रविवार" -#: js/messages.php:152 +#: js/messages.php:123 msgid "Monday" msgstr "सोमवार" -#: js/messages.php:153 +#: js/messages.php:124 msgid "Tuesday" msgstr "मन्गलवार" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "बुधवार" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "गुरूवार" -#: js/messages.php:156 +#: js/messages.php:127 msgid "Friday" msgstr "शुक्रवार" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "शनिवार" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "रविवार" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "सोमवार" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "मन्गलवार" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "बुधवार" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "गुरुवार" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "शुक्रवार" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "शनिवार" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 msgid "Su" msgstr "रविवार" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 msgid "Mo" msgstr "सोमवार" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 msgid "Tu" msgstr "मन्गलवार" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 msgid "We" msgstr "बुधवार" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 msgid "Th" msgstr "गुरुवार" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 msgid "Fr" msgstr "शुक्रवार" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 msgid "Sa" msgstr "शनिवार" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "हफ्ता" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "घंटा" -#: js/messages.php:194 +#: js/messages.php:165 msgid "Minute" msgstr "मिनट" -#: js/messages.php:195 +#: js/messages.php:166 msgid "Second" msgstr "सेकंड" @@ -1478,7 +1302,7 @@ msgstr "सूचकांक" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "अद्वितीय" @@ -1496,7 +1320,7 @@ msgid "Comment" msgstr "टिप्पणी" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1519,8 +1343,8 @@ msgid "" "removed." msgstr "सूचकांक %1s और %2s बराबर लगने के कारन उनमें से संभवतः हटाया जा सकता है." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr " डाटाबेस" @@ -1687,11 +1511,7 @@ msgstr "पासव्रड:" msgid "Server Choice" msgstr "सर्वर चुनिये" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "कुकीज़ इस बिंदु अतीत सक्षम होना चाहिए." @@ -1766,11 +1586,7 @@ msgid "" "necessary extensions appear to be loaded. Check your PHP configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "" @@ -1865,7 +1653,7 @@ msgstr "इंग्लिश" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "डोक्युमेंटेशन" @@ -1879,136 +1667,136 @@ msgstr "" msgid "MySQL said: " msgstr "" -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "SQL की व्याख्या " -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "PHP Code बनाओ" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "इस कुएरी की इनलाइन एडिट" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "इनलाइन" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr " बैट्स" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d %B, %Y को %I:%M %p" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s दिन, %s घंटे, %s मिनट and %s सेकंड" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "आखरी" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "" -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2027,7 +1815,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "नाम" @@ -2055,15 +1843,15 @@ msgstr "क्वरी" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr " प्रिविलेज" @@ -2083,11 +1871,7 @@ msgstr "" "शायद अनुमानित हैं. [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a] देखें" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "" @@ -2104,7 +1888,7 @@ msgstr "" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2114,36 +1898,22 @@ msgid "Change password" msgstr "पासव्रड बदलिये" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "पासवर्ड नहीं है" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "" @@ -2156,20 +1926,12 @@ msgid "MySQL 4.0 compatible" msgstr "" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "" @@ -2182,17 +1944,23 @@ msgstr " नया डाटाबेस बनाओ" msgid "Create" msgstr "बनाइये" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "कोइ प्रिविलेज नहीं" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "You have to choose at least one column to display" +msgid "Table must have at least one column." +msgstr "आपको कम से कम एक स्तंभ प्रदर्शित करने के लिए चयन करना है." + +#: libraries/display_create_table.lib.php:48 #, fuzzy, php-format msgid "Create table on database %s" msgstr " डाटाबेस मे नया टेबल बनाओ" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of rows per page" msgid "Number of columns" @@ -2254,11 +2022,7 @@ msgid "remember template" msgstr "" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "" @@ -2269,7 +2033,7 @@ msgstr "" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "" @@ -2311,11 +2075,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "" @@ -2323,20 +2083,12 @@ msgstr "" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "" @@ -2467,11 +2219,7 @@ msgstr "" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "" @@ -2539,14 +2287,14 @@ msgstr "रौ देखिये" msgid "total" msgstr " कुल" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "क्वरी को %01.4f सेकेंड का समय लगा" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "बदलिये" @@ -2612,11 +2360,7 @@ msgstr "बफर पूल उपयोग" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "" @@ -2861,11 +2605,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "" @@ -2933,13 +2673,8 @@ msgstr "" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr " डाटा" @@ -2988,15 +2723,9 @@ msgstr "" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "होस्ट" @@ -3193,7 +2922,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "" @@ -3205,7 +2934,7 @@ msgstr "" msgid "Generated by" msgstr "" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "" @@ -3350,20 +3079,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "" @@ -3588,6 +3317,10 @@ msgstr "" msgid "not OK" msgstr "" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "" @@ -3609,7 +3342,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "बुकमार्क किया हुआ SQL-क्वरी" @@ -3660,13 +3393,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "यूसर नेम" @@ -3683,22 +3411,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "मूल्य" @@ -3716,40 +3436,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "कोई भी उपयोगकर्ता" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "कोई भी होस्ट" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Local" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3773,7 +3464,6 @@ msgid "Use Host Table" msgstr "" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3807,29 +3497,29 @@ msgstr "" msgid "Servers" msgstr "" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "बाइनरी लोग" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3856,51 +3546,51 @@ msgstr "" msgid "Target database" msgstr "" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "डाटाबेस %s में SQL query/queries चलाइये " -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "कोलम के नाम" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "इस SQL-क्वरी को बुकमार्क कीजिये " -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "हर उपयोकर्ता को अनुमति दें इस बुकमार्क का उपयोग करने के लिए" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "एक ही नाम के सभी बुकमार्क्स बदल दें" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " यह query वापस यहीं दिखायें " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "केवल देखिये" @@ -4044,13 +3734,13 @@ msgstr "" msgid "Save" msgstr "" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "%s क्षेत्र जोडें" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to add at least one column." @@ -4184,8 +3874,8 @@ msgstr "" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "यूसर" @@ -4609,111 +4299,111 @@ msgstr "" msgid "View dump (schema) of databases" msgstr "" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "" -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "" -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "" -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "" -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "" -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "" -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "" -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "" -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "" -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "" -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "" -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "" -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "" -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "" -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "" -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Limits the number of new connections the user may open per hour." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Limits the number of queries the user may send to the server per hour." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4721,214 +4411,214 @@ msgstr "" "Limits the number of commands that change any table or database the user may " "execute per hour." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "" -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "" -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "" -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "" -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "" -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "" -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " "killing threads of other users." msgstr "" -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "" -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "" -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "No" msgctxt "None privileges" msgid "None" msgstr "नहीं" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr " केवल टेबल के प्रिविलेज" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " नोट: MySQL प्रिविलेज नामों को अंग्रेजी मे लिखा गया है " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr " केवल डाटाबेस के प्रिविलेज" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "एडमिनिस्ट्रेशन" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "पासवर्ड मत बदलिये" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "कोई यूसर नहीं।" -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "आपने नया यूसर बना लिया" -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "आपने %s के प्रिविलेज अपडेट कर दिया ।" -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "आपने %s के privileges वापस ले लिया " -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "" -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "" -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "" -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr " प्रिविलेज एडिट करें" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "वापस लो" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "कोई" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "नया यूसर जोडें" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Drop the databases that have the same names as the users." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -4937,91 +4627,91 @@ msgid "" "sreload the privileges%s before you continue." msgstr "" -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "" -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr " केवल कोलम के प्रिविलेज" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "इन डाटाबेसों के लिये विशेषाधिकार जोडें" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "इन टेबल के लिये विशेषाधिकार जोडें" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "" -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "" -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr "" -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "No" msgctxt "Create none database for user" msgid "None" msgstr "नहीं" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "" @@ -7595,25 +7285,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "लेबल" @@ -7663,13 +7353,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "और फिर" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "पिछले पृष्ट पर वापस जाएँ" @@ -7748,7 +7431,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "सूचकांक में जोडें  %s column(s)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -7862,41 +7545,6 @@ msgstr "" msgid "Show tables" msgstr " टेबल दिखाओ" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "उपयोग" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr " वास्तविक" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr " रौ की लंबाई" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "" @@ -7930,7 +7578,6 @@ msgid "Row length" msgstr " रौ की लंबाई" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "" @@ -7998,50 +7645,50 @@ msgstr "नहीं" msgid "Column %s has been dropped" msgstr " टेबल %s को रद्द किया गया है." -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr " %s पर एक प्राईमरी की जड़ी गयी है" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "%s पर एक सूचकांक जोड़ा गया है" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "%s क्षेत्र जोडें" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "टेबल के आखिर में" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "टेबल के शुरू में" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "%s के बाद" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "  %s  कोलम पर इन्डेक्स बनाऐं " -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8083,6 +7730,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/hr.po b/po/hr.po old mode 100755 new mode 100644 index 1e18f0db0..c037d7fb2 --- a/po/hr.po +++ b/po/hr.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:13+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: croatian \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Prikaži sve" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Traži" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Kreni" @@ -113,7 +93,7 @@ msgstr "Upotrijebi ovu vrijednost" msgid "Database %1$s has been created." msgstr "Baza podataka %1$s uspješno je izrađena." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Komentar baze podataka: " @@ -140,17 +120,10 @@ msgstr "Nazivi stupaca" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Vrsta" @@ -163,7 +136,7 @@ msgstr "Vrsta" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -187,24 +160,18 @@ msgstr "Povezano s" msgid "Comments" msgstr "Komentari" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Ne" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -213,15 +180,9 @@ msgstr "Ne" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -240,143 +201,135 @@ msgstr "Prikaži ispis (shemu) baze podataka" msgid "No tables found in database." msgstr "U bazi podataka nisu pronađene tablice." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Odaberi sve" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Ukloni sav odabir" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Naziv baze podataka je prazan!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Baza podataka %s preimenovana je u %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Baza podataka %s kopirana je u %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Preimenuj bazu podataka u" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Naredba" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "i potom" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Kopiraj bazu podataka u" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Samo strukturu" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Strukturu i podatke" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Samo podatke" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "Prije kopiranja izradi bazu podataka (CREATE DATABASE)" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Dodaj %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Dodaj vrijednost AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Dodaj prisile" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Prebaci se na kopiranu bazu podataka" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Stanje" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Omogućeno" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "Onemogućeno" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair" msgctxt "BLOB repository" msgid "Repair" msgstr "Popravi" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Onemogućeno" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "Omogućeno" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Uspoređivanje" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -385,14 +338,14 @@ msgstr "" "Dodatne osobine za rad s relacijski tablicama su isključene. Kako biste " "saznali razloge, pritisnite %sovdje%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Uredi PDF stranice" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -401,11 +354,7 @@ msgstr "Tablica" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Redaka" @@ -413,42 +362,30 @@ msgstr "Redaka" msgid "Size" msgstr "Veličina" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "u upotrebi" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Izrada" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Posljednje ažuriranje" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Posljednja provjera" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -509,11 +446,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Ili" @@ -547,85 +480,85 @@ msgstr "Upotrijebi tablice" msgid "SQL query on database %s:" msgstr "SQL upit nad bazom podataka %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Podnesi upit" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Pristup odbijen" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "najmanje jedna riječ" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "sve riječi" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "točan izraz" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "kao regularan izraz" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Rezultati pretraživanja za \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s poklapanja unutar tablice %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Pretraživanje" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Izbriši" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Ukupno: %s poklapanja" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Traži u bazi podataka" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Riječi ili vrijednost za pretraživanje (džoker: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Traži:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Riječi su razdvojene znakom razmaka (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Unutar tablica:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -633,36 +566,36 @@ msgstr "Unutar polja:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Umetni" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Strukturu" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Ispusti" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Isprazni" @@ -672,25 +605,25 @@ msgstr "Isprazni" msgid "Table %s has been emptied" msgstr "Tablica %s je očišćena" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Index %s je ispušten" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Tablica %s je odbačen" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -698,92 +631,86 @@ msgid "" msgstr "" "Ovaj prikaz sadrži najmanje ovoliko redaka. Proučite %sdokumentaciju%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Prikaz" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replikacija" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Zbroj" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s je zadani pogon pohranjivanja na ovom MySQL poslužitelju." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "S odabirom:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Označi sve" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Ukloni sve oznake" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Provjeri za prepunjene tablice" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Prikaz ispisa" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Provjeri tablicu" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimiziraj tablicu" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Popravi tablicu" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analiziraj tablicu" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Izvoz" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Rječnik podataka" @@ -795,10 +722,10 @@ msgstr "Provjeri tablicu" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -820,8 +747,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Aktivnost" @@ -858,8 +785,8 @@ msgstr "Samo strukturu" msgid "Untracked tables" msgstr "Provjeri tablicu" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Provjeri tablicu" @@ -944,7 +871,7 @@ msgstr "Favorit je izbrisan." msgid "Showing bookmark" msgstr "Prikazivanje oznake" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Izrađen je favorit %s" @@ -1030,293 +957,186 @@ msgstr "Naziv računala je prazan!" msgid "The user name is empty!" msgstr "Korisničko ime je prazno!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Lozinka je prazna!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Lozinke se ne podudaraju!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Dodaj novog korisnika" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Izradi relaciju" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Ponovno učitaj privilegije" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Ukloni odabrane korisnike" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Odustani" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Lokalno" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Procesi" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "U redu " - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Preimenuj bazu podataka u" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Baza podataka" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Kopiraj bazu podataka u" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Tablica znakova" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Tablica mora sadržavati najmanje jedno polje." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Izradi tablicu" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Traži" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Izmjene su spremljene" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Relacija je izbrisana" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "Dodana je relacija FOREIGN KEY" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Dodane interne relacije" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Pogreška: Relacija nije dodana." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Pogreška: Relacija već postoji." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Pogreška tijekom spremanja koordinata za Kreatora." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Opće osobine relacija" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Onemogućeno" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Odaberite referentni ključ" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Odaberite strani ključ" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Odaberite primarni ključ ili jedinstveni ključ" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Odaberi polje za prikaz" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy msgid "Done" msgstr "Podaci" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Prethodni" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Sljedeće" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Ukupno" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Binarno" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Ožu" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Tra" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Svi" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Lip" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Srp" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Kol" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Lis" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Sij" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Velj" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Ožu" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Tra" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1324,178 +1144,178 @@ msgid "May" msgstr "Svi" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Lip" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Srp" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Kol" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Ruj" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Lis" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Stu" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Pro" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Ned" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Pon" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Uto" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Pet" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Ned" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Pon" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Uto" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Sri" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Čet" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Pet" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sub" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Ned" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Pon" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Uto" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Sri" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Čet" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Pet" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Sub" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "Wiki" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "u upotrebi" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1556,7 +1376,7 @@ msgstr "Indeksi" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Jedinstveno" @@ -1574,7 +1394,7 @@ msgid "Comment" msgstr "Komentar" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1598,8 +1418,8 @@ msgid "" msgstr "" "Indeksi %1$s i %2$s izgledaju jednakim i jednog od njih moguće je ukloniti." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Baze podataka" @@ -1770,11 +1590,7 @@ msgstr "Lozinka:" msgid "Server Choice" msgstr "Odabir poslužitelja" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Od ovog mjesta potrebno je omogućiti kolačiće." @@ -1855,11 +1671,7 @@ msgstr "" "izgleda da su sva potrebna proširenja učitana. Provjerite svoju PHP " "konfiguraciju." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Ako se prikaže prazna stranica, sve je u redu." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Nije moguće učitati zadanu konfiguraciju iz: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1897,50 +1701,30 @@ msgstr "" "Direktiva $cfg['PmaAbsoluteUri'] MORA BITI postavljena u vašoj " "konfiguracijskoj datoteci!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Neispravan indeks poslužitelja: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" "Neispravan naziv za poslužitelj %1$s. Molimo, pregledajte svoju " "konfiguraciju." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Poslužitelj" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Neispravan komplet načina provjere vjerodostojnosti u konfiguraciji:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Neispravan komplet načina provjere vjerodostojnosti u konfiguraciji:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Trebali biste nadograditi na %s %s ili kasniju." @@ -1968,7 +1752,7 @@ msgstr "Poslano" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentacija" @@ -1982,138 +1766,138 @@ msgstr "SQL upit" msgid "MySQL said: " msgstr "MySQL je poručio: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Objasni SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Preskoči Objasni SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "Bez PHP koda" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Izradi PHP kod" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Osvježi" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Preskoči provjeru valjanosti SQL-a" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Provjera valjanosti SQL-a" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Pogoni" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Izrada profila" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Vrijeme" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "B" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "kB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "." #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%B %d, %Y u %I:%M %p" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s dana, %s sati, %s minuta i %s sekunda" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Na vrh stranice" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Prethodni" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Završetak" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Skoči do baze podataka \"%s\"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "Na funkcionalnost %s utječe poznati nedostatak. Pogledajte %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2134,7 +1918,7 @@ msgid "Events" msgstr "Događaji" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Naziv" @@ -2162,15 +1946,15 @@ msgstr "Upit" msgid "Designer" msgstr "Kreator" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Uvoz" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privilegije" @@ -2189,11 +1973,7 @@ msgid "" msgstr "Može biti približno. Pogledajte ČPP 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Prepunjenje" @@ -2213,7 +1993,7 @@ msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" "(ili priključak lokalnog MySQL poslužitelja nije ispravno konfiguriran)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Detalji..." @@ -2223,36 +2003,22 @@ msgid "Change password" msgstr "Promijeni lozinku" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Bez lozinke" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Lozinka" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Ponovite" @@ -2267,20 +2033,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 kompatibilno" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Generiraj lozinku" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Generiraj" @@ -2293,17 +2051,23 @@ msgstr "Izradi novu bazu podataka" msgid "Create" msgstr "Izradi" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Bez privilegija" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Tablica mora sadržavati najmanje jedno polje." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Izradi novu tablicu u bazi podataka %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2368,11 +2132,7 @@ msgid "remember template" msgstr "zapamti predložak" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Tablica znakova za datoteku:" @@ -2383,7 +2143,7 @@ msgstr "Kompresija" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "bez kompresije" @@ -2425,11 +2185,7 @@ msgstr "" msgid "File to import" msgstr "Datoteka za uvoz" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Lokacija tekstualne datoteke" @@ -2437,20 +2193,12 @@ msgstr "Lokacija tekstualne datoteke" msgid "File uploads are not allowed on this server." msgstr "Učitavanje datoteka nije dopušteno na ovom poslužitelju." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Mapu koju ste odabrali za potrebe učitavanja nije moguće dohvatiti" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "mapa učitavanja web poslužitelja" @@ -2586,11 +2334,7 @@ msgstr "Presloži po ključu" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Opcije" @@ -2660,14 +2404,14 @@ msgstr "Prikazivanje redaka" msgid "total" msgstr "ukupno" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Upit je trajao %01.4f sek" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Promijeni" @@ -2737,11 +2481,7 @@ msgstr "Iskoristivost međuspremnika" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Ukupno" @@ -3030,11 +2770,7 @@ msgstr "" "broj." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Oblikovanje" @@ -3106,13 +2842,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Podaci" @@ -3161,15 +2892,9 @@ msgstr "MIME vrsta" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Računalo" @@ -3368,7 +3093,7 @@ msgstr "Vrsta izvoza" msgid "Open new phpMyAdmin window" msgstr "Otvori novi phpMyAdmin prozor" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Nema tablica" @@ -3381,7 +3106,7 @@ msgstr "SQL rezultat" msgid "Generated by" msgstr "Generirano s" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL je vratio prazan komplet rezultata (npr. nula redova)." @@ -3531,20 +3256,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primarni" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Indeks" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Puni tekst" @@ -3769,6 +3494,10 @@ msgstr "Ovaj oblik nema raspoložive opcije" msgid "not OK" msgstr "nije OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "U redu " + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Omogućeno" @@ -3791,7 +3520,7 @@ msgid "" msgstr "" "Pogledajte dokumentaciju radi uputa o ažuriranju tablice column_comments." -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Favorizirani SQL upit" @@ -3842,13 +3571,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Korisničko ime" @@ -3868,22 +3592,14 @@ msgstr "Prikaži stanje potčinjenog" msgid "Slave status" msgstr "Prikaži stanje potčinjenog" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Varijabla" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Vrijednost" @@ -3901,40 +3617,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Bilo koji korisnik" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Upotrijebi tekstualno polje" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Bilo koje računalo" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Lokalno" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Ovo računalo" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Upotrijebi tablicu poslužitelja" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3958,7 +3645,6 @@ msgid "Use Host Table" msgstr "Upotrijebi tablicu poslužitelja" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3992,29 +3678,29 @@ msgstr "Nepoznati jezik: %1$s." msgid "Servers" msgstr "Poslužitelji" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Varijable" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Tablice znakova" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Pogoni" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Binarni zapisnik" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Procesi" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -4044,51 +3730,51 @@ msgstr "" msgid "Target database" msgstr "Traži u bazi podataka" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Pokreni SQL upit na poslužitelju %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Pokreni SQL upit na bazi podataka %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Nazivi stupaca" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Favoriziraj ovaj SQL upit" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Neka svi korisnici imaju pristup ovom favoritu" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Zamijeni postojećim favoritom istog naziva" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Ne prepisuj ovaj upit iz vanjskog prozora" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Razgraničavanje" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr "Ovaj upit ponovno prikaži ovdje" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Podnesi" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Samo prikaz" @@ -4265,13 +3951,13 @@ msgstr "Definicija PARTICIJE" msgid "Save" msgstr "Spremi" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "Dodaj %s polja" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4487,8 +4173,8 @@ msgstr "Povrat" msgid "Protocol version" msgstr "Verzija protokola" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Korisnik" @@ -4939,114 +4625,114 @@ msgstr "Pogoni pohrane" msgid "View dump (schema) of databases" msgstr "Prikaži ispis (shemu) baza podataka" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Obuhvaća sve privilegije osim GRANT (Podari)." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Dopušta izmjenu strukture postojećih tablice." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Dopušta izmjenu i odbacivanje pohranjenih rutina." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Dopušta izradu novih baze podataka i tablice." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Dopušta izradu pohranjenih rutina." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Dopušta izradu novih tablica." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Dopušta izradu privremenih tablica." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Dopušta izradu, odbacivanje i preimenovanje korisničkih naloga." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Dopušta izradu novih prikaza." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Dopušta brisanje podataka." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Dopušta odbacivanje baza podataka i tablica." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Dopušta odbacivanje tablica." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Omogućuje postavljanje događaja za planer" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Dopušta pokretanje pohranjenih rutina." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Dopušta uvoz i izvoz podataka iz datoteka." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Dopušta dodavanje korisnika i privilegija bez ponovnog učitavanja tablica." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Dopušta izradu i odbacivanje indeksa." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Dopušta umetanje i zamjenu podataka." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Dopušta zaključavanje tablica u trenutnoj grani." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Ograničava broj novih povezivanja koje korisnik može otvoriti, po satu." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Ograničava broj upita koje korisnik može poslati poslužitelju, po satu." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5054,61 +4740,61 @@ msgstr "" "Ograničava broj naredbi koje korisnik može pokrenuti, a čija je namjena " "mijenjanje bilo koje tablice ili baze podataka, po satu." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Ograničava broj istovremenih povezivanja koje korisnik može imati." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Omogućuje pregledavanje procesa za sve korisnike" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Nema učinka u ovoj verziji MySQL-a." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Dopušta ponovno učitavanje postavki poslužitelja i pražnjenje privremene " "pohrane poslužitelja." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" "Dopušta korisnik postavljanje upita o lokaciji potčinjenih i gospodara." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Potrebno za replikacijske potčinjene." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Dopušta čitanje podataka." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Daje pristup cjelokupnom popisu baza podataka." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Dopušta izvođenje upita SHOW CREATE VIEW." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Dopušta gašenje poslužitelja." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5118,158 +4804,158 @@ msgstr "" "većinu administrativnih operacija poput postavljanja općih varijabli ili " "eliminiranje grana drugih korisnika." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Omogućuje izradu i uklanjanje okidača" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Dopušta mijenjanje podataka." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Bez privilegija." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "bez kompresije" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Privilegije specifične za tablicu" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Napomena: Nazivi MySQL privilegija navedeni su na engleskom jeziku " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Opće privilegije" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Privilegije specifične za bazu podataka" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administracija" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Ograničenja resursa" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" "Napomena: Postavljanje ovih opcija na vrijednost 0 (nula) uklanja " "ograničenje." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "_Podaci prijave" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Ne mijenjaj lozinku" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Korisnici nisu pronađeni." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Korisnik %s već postoji!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Dodali ste novog korisnika." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Ažurirali ste privilegije za %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Opozvali ste privilegije za %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Lozinka za %s uspješno je promijenjena." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Brisanje %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Nema odabranih korisnika za uklanjanje!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Ponovno učitavanje privilegija" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Odabrani korisnici uspješno su izbrisani." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Privilegije su uspješno učitane." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Uredi privilegije" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Opozovi" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Pregled korisnika" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Podarivanje" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Bilo koji" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Dodaj novog korisnika" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Ukloni odabrane korisnike" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Opozovi sve aktivne privilegije korisnika i potom ih izbriši." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Ispusti baze podataka koje imaju iste nazive i korisnike." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5282,94 +4968,94 @@ msgstr "" "može se razlikovati od privilegija koje upotrebljava poslužitelj. U tom je " "slučaju potrebno %sponovo učitati privilegije%s prije nastavljanja rada." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Odabrani korisnik nije pronađen u tablici privilegija." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Privilegije specifične za stupac" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Dodaj privilegije za sljedeće baze podataka" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Kako bi se mogli upotrebljavati u doslovnom smislu, džokerima \\_ i \\% mora " "prethoditi znak \\" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Dodaj privilegije za sljedeću tablicu" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Promjena podataka prijave / Kopiranje korisnika" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Izradi novog korisnika s istim privilegijama i..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... zadržati staru." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... izbriši starog iz korisničkih tablica." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... opozovi sve aktivne privilegije iz stare i potom je izbriši." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" " ... izbriši starog iz korisničkih tablica i potom ponovo učitaj privilegije." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Baza podataka za korisnika" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "bez kompresije" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Izradi bazu podataka istog naziva i podari sve privilegije" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Podari sve privilegije imenima s džokerima (korisničkoime_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "Provjeri privilegije za bazu podataka \"%s\"." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Korisnici koji imaju pristup u \"%s\"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "opće" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "specifično za bazu podataka" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "džoker" @@ -8137,25 +7823,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "Umetnut ID retka: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Prikazivanje kao PHP koda" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Prikazivanje SQL upita" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Problemi s indeksima tablice `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Oznaka" @@ -8209,13 +7895,6 @@ msgstr "" msgid "Show insert query" msgstr "Prikazivanje SQL upita" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "i potom" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Kreni nazad na prethodnu stranicu" @@ -8297,7 +7976,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Dodaj u indeks  %s stupci" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Broj stupaca mora biti veći od nule." @@ -8411,41 +8090,6 @@ msgstr "Provjeri referencijalan integritet:" msgid "Show tables" msgstr "Prikaži tablice" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Iskorištenost prostora" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Upotreba" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Na snazi" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Statistike redova" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Izjave" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinamički" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Duljina retka" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Iskorištenost prostora" @@ -8479,7 +8123,6 @@ msgid "Row length" msgstr "Duljina retka" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Veličina retka " @@ -8553,50 +8196,50 @@ msgstr "bez kompresije" msgid "Column %s has been dropped" msgstr "Tablica %s je odbačen" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Primarni ključ je dodan na %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Indeks je pridodan na %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Prikaz relacija" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Predloži strukturu tablice" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "Dodaj %s polja" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Pri završetku tablice" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Pri početku tablice" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Poslije %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Izradi indeks  %s stupaca" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "particionirano" @@ -8638,6 +8281,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -9050,6 +8697,9 @@ msgstr "Preimenuj tablicu u" #~ msgid "Process list" #~ msgstr "Popis procesa" +#~ msgid "Reload privileges" +#~ msgstr "Ponovno učitaj privilegije" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/hu.po b/po/hu.po old mode 100755 new mode 100644 index c53653249..d2d5aa78a --- a/po/hu.po +++ b/po/hu.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:15+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: hungarian \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Mind látható" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Keresés" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Indítás" @@ -113,7 +93,7 @@ msgstr "Ezen érték használata" msgid "Database %1$s has been created." msgstr "A(z) %1$s adatbázis elkészült." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Megjegyzés az adatbázishoz: " @@ -140,17 +120,10 @@ msgstr "Oszlopnevek" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Típus" @@ -163,7 +136,7 @@ msgstr "Típus" msgid "Null" msgstr "Nulla" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -187,24 +160,18 @@ msgstr "Hivatkozások:" msgid "Comments" msgstr "Megjegyzések" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Nem" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -213,15 +180,9 @@ msgstr "Nem" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -240,141 +201,133 @@ msgstr "Adatbázis kiírás (vázlat) megtekintése" msgid "No tables found in database." msgstr "Nem található tábla az adatbázisban." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Mind kijelölése" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Mind törlése" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Üres az adatbázis neve!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "A(z) %s adatbázis átnevezése %s névre megtörtént" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "A(z) %s adatbázis másolása a(z) %s adatbázisba megtörtént" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Adatbázis átnevezése" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Parancs" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "és utána" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Adatbázis másolása" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Csak a szerkezet" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Szerkezet és adatok" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Csak az adatok" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREATE DATABASE másolás előtt" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "%s hozzáadása" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "AUTO_INCREMENT érték hozzáadása" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Megszorítás hozzáadása" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "A másolt adatbázisra váltás" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "BLOB-ratár" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Állapot" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Engedélyezett" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Letiltás" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Sérült" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair" msgctxt "BLOB repository" msgid "Repair" msgstr "Javítás" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Letiltott" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Engedélyezés" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Illesztés" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -383,14 +336,14 @@ msgstr "" "A hivatkozott táblákkal történő munka kiegészítő funkciói inaktiválásra " "kerültek. Ha szeretné megtudni, hogy miért, kattintson %side%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "PDF oldalak szerkesztése" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -399,11 +352,7 @@ msgstr "Tábla" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "sor" @@ -411,42 +360,30 @@ msgstr "sor" msgid "Size" msgstr "Méret" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "használatban" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Létrehozás" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Utolsó frissítés" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Utolsó ellenőrzés" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -507,11 +444,7 @@ msgstr "Törlés" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Vagy" @@ -545,85 +478,85 @@ msgstr "Felhasználandó táblák" msgid "SQL query on database %s:" msgstr "SQL-lekérdezés a(z) %s adatbázison:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Lekérdezés indítása" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "A hozzáférés megtagadva" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "legalább az egyik szó" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "minden szó" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "a pontos kifejezés" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "reguláris kifejezésként" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Keresési eredmények \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s találat a(z) %s táblában" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Tartalom" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Törlés" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Összesen: %s találat" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Keresés az adatbázisban" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Keresendő szavak vagy értékek (karakterhelyettesítő: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Keresés:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "A szavak elválasztása szóköz karakterrel (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Táblá(k)ban:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -631,36 +564,36 @@ msgstr "Mezőben:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Beszúrás" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Szerkezet" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Eldobás" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Kiürítés" @@ -670,25 +603,25 @@ msgstr "Kiürítés" msgid "Table %s has been emptied" msgstr "A(z) %s tábla kiürítése megtörtént" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "A(z) %s nézet eldobása kész" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "A(z) %s tábla eldobása megtörtént" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -697,92 +630,86 @@ msgstr "" "Ebben a nézetben legalább ennyi számú sor van. Kérjük, hogy nézzen utána a %" "sdokumentációban%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Nézet" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Többszörözés" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Összeg" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "Ezen a MySQL szerveren a(z) %s az alapértelmezett tárolómotor." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "A kijelöltekkel végzendő művelet:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Mind kijelölése" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Kijelölés törlése" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "A felülírott táblák kijelölése" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Nyomtatási nézet" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Tábla ellenőrzése" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Tábla optimalizálása" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Tábla javítása" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Tábla elemzése" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Exportálás" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Adatkönyvtár" @@ -794,10 +721,10 @@ msgstr "A zárolt táblák kihagyása" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -818,8 +745,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Művelet" @@ -856,8 +783,8 @@ msgstr "Csak a szerkezet" msgid "Untracked tables" msgstr "A zárolt táblák kihagyása" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Tábla ellenőrzése" @@ -943,7 +870,7 @@ msgstr "A könyvjelző törlése megtörtént." msgid "Showing bookmark" msgstr "Könyvjelző megjelenítése" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "A(z) %s könyvjelző elkészült" @@ -1028,295 +955,187 @@ msgstr "A hosztnév üres!" msgid "The user name is empty!" msgstr "Üres a felhasználónév!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Üres a jelszó mező!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Nem egyeznek a jelszavak!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Új felhasználó hozzáadása" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Kapcsolat létrehozása" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Jogok újratöltése" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "A kijelölt felhasználók törlése" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Mégse" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Betöltés" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Folyamatok" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Adatbázis átnevezése" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Adatbázis" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Adatbázis másolása" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Karakterkészlet" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "A táblázatnak legalább egy mezőt kell tartalmaznia." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Tábla létrehozása" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Keresés" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "A módosítások mentése megtörtént" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "A kapcsolat törlése kész" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "IDEGEN KULCS kapcsolat hozzáadása megtörtént" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "A belső kapcsolat hozzáadása megtörtént" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Hiba: Nem adta hozzá a kapcsolatot." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Hiba: A kapcsolat már létezik." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Hiba történt a Tervező koordinátáinak mentésekor." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Általános relációs jellemzők" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Letiltott" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Válassza ki a hivatkozott kulcsot" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Idegen kulcs kiválasztása" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Válassza ki az elsődleges kulcsot, vagy egy egyedi kulcsot" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Válassza ki a megjelenítendő mezőt" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "Donate" msgid "Done" msgstr "Adományozás" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Előző" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Következő" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Összesen" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Bináris" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "márc." -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "ápr." -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "máj." -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "jún." -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "júl." -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "aug." -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "okt." -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "jan." #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "febr." #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "márc." #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "ápr." #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1324,178 +1143,178 @@ msgid "May" msgstr "máj." #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "jún." #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "júl." #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "aug." #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "szept." #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "okt." #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "nov." #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "dec." -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "V" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "H" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "K" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "P" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "V" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "H" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "K" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Sze" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Cs" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "P" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Szo" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "V" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "H" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "K" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Sze" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Cs" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "P" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Szo" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "Wiki" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "használatban" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1556,7 +1375,7 @@ msgstr "Indexek" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Egyedi" @@ -1574,7 +1393,7 @@ msgid "Comment" msgstr "Megjegyzés" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1599,8 +1418,8 @@ msgstr "" "A(z) %1$s és a(z) %2$s egyenlőnek tűnik, és egyikük valószínűleg " "eltávolítható." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Adatbázisok" @@ -1773,11 +1592,7 @@ msgstr "Jelszó:" msgid "Server Choice" msgstr "Szerver választása" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Ettől a ponttól engedélyeznie kell a cookie-k fogadását." @@ -1860,11 +1675,7 @@ msgstr "" "úgy tűnik, hogy a szükséges kiterjesztések betöltése megtörtént. Ellenőrizze " "a PHP beállításokat." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Ha üres oldalt kap, akkor minden " "rendben." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "" "Nem lehetett betölteni az alapértelmezett konfigurációt innen: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1903,48 +1706,28 @@ msgstr "" "A $cfg['PmaAbsoluteUri'] utasítás értékét a konfigurációs fájlban " "KELL megadni!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Érvénytelen szerverindex: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "A(z) %1$s szerver hosztneve érvénytelen. Ellenőrizze a beállításokat." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Szerver" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Érvénytelen hitelesítési mód került beállításra a konfigurációban:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Érvénytelen hitelesítési mód került beállításra a konfigurációban:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Frissítenie kell %s %s vagy újabb verzióra." @@ -1971,7 +1754,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentáció" @@ -1985,138 +1768,138 @@ msgstr "SQL-lekérdezés" msgid "MySQL said: " msgstr "A MySQL mondta: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Az SQL magyarázata" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "SQL magyarázat átugrása" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "PHP kód nélkül" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "PHP-kód létrehozása" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Frissítés" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "SQL érvényesítés átugrása" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "SQL érvényesítése" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Motorok" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Adatgyűjtés" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Idő" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Bájt" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr " " #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%Y. %B %d. %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s nap, %s óra, %s perc, %s másodperc" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "A tetejére" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Előző" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Vége" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Ugrás a(z) "%s" adatbázishoz." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "A(z) %s funkcióra egy ismert hiba van hatással, lásd itt: %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2137,7 +1920,7 @@ msgid "Events" msgstr "Események" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Név" @@ -2165,15 +1948,15 @@ msgstr "Lekérdezés" msgid "Designer" msgstr "Tervező" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Importálás" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Jogok" @@ -2192,11 +1975,7 @@ msgid "" msgstr "Becsült érték lehet. Lásd: GYIK 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Felülírás" @@ -2217,7 +1996,7 @@ msgstr "" "(vagy nem megfelelően állították be a helyi MySQL szerver " "szoftvercsatornáját)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Részletek..." @@ -2227,36 +2006,22 @@ msgid "Change password" msgstr "Jelszó megváltoztatása" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Nincs jelszó" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Jelszó" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Újraírás" @@ -2271,20 +2036,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 kompatibilis" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Jelszó generálása" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Generálás" @@ -2297,17 +2054,23 @@ msgstr "Új adatbázis létrehozása" msgid "Create" msgstr "Létrehozás" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Nincs jog" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "A táblázatnak legalább egy mezőt kell tartalmaznia." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Új tábla létrehozása a(z) %s adatbázisban" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2374,11 +2137,7 @@ msgid "remember template" msgstr "a sablon megjegyzése" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "A fájl karakterkészlete:" @@ -2389,7 +2148,7 @@ msgstr "Tömörítés" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Nincs" @@ -2431,11 +2190,7 @@ msgstr "" msgid "File to import" msgstr "Importálandó fájl" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "A szövegfájl helye" @@ -2443,20 +2198,12 @@ msgstr "A szövegfájl helye" msgid "File uploads are not allowed on this server." msgstr "Ezen a szerveren a fájlfeltöltések nem engedélyezettek." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Nem elérhető a feltöltésekhez megadott könyvtár" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "webszerver feltöltési könyvtár" @@ -2594,11 +2341,7 @@ msgstr "Kulcs szerinti rendezés" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Beállítások" @@ -2669,14 +2412,14 @@ msgstr "Megjelenített sorok:" msgid "total" msgstr "összesen" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "a lekérdezés %01.4f másodpercig tartott" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Módosítás" @@ -2746,11 +2489,7 @@ msgstr "Pufferkészlet kihasználtsága" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Összesen" @@ -3038,11 +2777,7 @@ msgstr "" "nekik." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Formátum" @@ -3116,13 +2851,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Adatok" @@ -3171,15 +2901,9 @@ msgstr "MIME-típus" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Hoszt" @@ -3377,7 +3101,7 @@ msgstr "Exportálás alapértelmezései" msgid "Open new phpMyAdmin window" msgstr "Új phpMyAdmin ablak nyitása" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Nincs tábla" @@ -3390,7 +3114,7 @@ msgstr "SQL-eredmény" msgid "Generated by" msgstr "Készítette" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "A MySQL üres eredményhalmazt adott vissza (pl. nulla sorok)." @@ -3540,20 +3264,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Elsődleges" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Index" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Teljes szöveg" @@ -3778,6 +3502,10 @@ msgstr "Ennek a formátumnak nincsenek beállításai" msgid "not OK" msgstr "Nincs rendben" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Engedélyezett" @@ -3801,7 +3529,7 @@ msgstr "" "Kérjük, olvassa el a dokumentációban a column_comments tábla frissítéséről " "szóló fejezetet" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Könyvjelzőkhöz hozzáadott SQL-lekérdezés" @@ -3853,13 +3581,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Felhasználónév" @@ -3877,22 +3600,14 @@ msgstr "Mester állapot" msgid "Slave status" msgstr "Másodlagos állapot" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Változó" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Érték" @@ -3910,40 +3625,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Bármilyen felhasználó" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Szöveges mező használata" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Bármilyen hoszt" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Helyi" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Ez a hoszt" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Hoszt-tábla használata" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3967,7 +3653,6 @@ msgid "Use Host Table" msgstr "Hoszt-tábla használata" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -4003,29 +3688,29 @@ msgstr "Ismeretlen nyelv: %1$s." msgid "Servers" msgstr "Szerverek" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Változók" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Karakterkészlet" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Motorok" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Bináris napló" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Folyamatok" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -4055,53 +3740,53 @@ msgstr "" msgid "Target database" msgstr "Keresés az adatbázisban" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "A(z) %s szerveren lefuttatandó SQL lekérdezés(ek)" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "SQL lekérdezés(ek) futtatása a(z) %s adatbázison" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Oszlopnevek" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Az SQL-lekérdezés hozzáadása a könyvjelzőkhöz" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "" "A hozzáférés ehhez a könyvjelzőhöz az összes felhasználó számára " "engedélyezett" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Az ugyanazon nevű könyvjelző kicserélése" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Nem írja felül ezt a lekérdezést az ablakon kívülről" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Elválasztó" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " A fenti lekérdezés megjelenítése itt újra " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Indítás" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Csak megtekinthető" @@ -4281,13 +3966,13 @@ msgstr "PARTITION definíció" msgid "Save" msgstr "Mentés" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "%s mező hozzáadása" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4508,8 +4193,8 @@ msgstr "Törlés" msgid "Protocol version" msgstr "Protokoll verzió" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Felhasználó" @@ -4969,117 +4654,117 @@ msgstr "Tárolómotorok" msgid "View dump (schema) of databases" msgstr "Adatbázis kiírás (séma) megtekintése" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "A GRANT kivételével minden jogot tartalmaz." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Engedélyezi a létező táblák szerkezetének megváltoztatását." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Engedélyezi a tárolt eljárások módosítását és eldobását." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Engedélyezi új adatbázisok és táblák készítését." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Engedélyezi tárolt eljárások létrehozását." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Engedélyezi új táblák készítését." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Engedélyezi ideiglenes táblák készítését." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" "Engedélyezi a felhasználói fiókok létrehozását, törlését és átnevezését." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Engedélyezi új nézetek létrehozását." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Engedélyezi az adatok törlését." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Engedélyezi az adatbázisok és táblák eldobását." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Engedélyezi a táblák eldobását." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Az eseményütemező eseményeinek beállítását teszi lehetővé" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Engedélyezi a tárolt eljárások végrehajtását." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Engedélyezi az adatok fájlokba történő exportálását/importálását." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "A privilégium táblák újratöltése nélkül engedélyezi a felhasználók és jogok " "hozzáadását." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Engedélyezi indexek készítését és törlését." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Engedélyezi az adatok beírását és megváltoztatását." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "A jelenlegi szálon engedélyezi a táblák blokkolását." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Korlátozza a felhasználó által óránként megnyitható új kapcsolatok számát." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Korlátozza a felhasználó által a kiszolgálóra óránként küldhető lekérdezések " "számát." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5087,62 +4772,62 @@ msgstr "" "Korlátozza a felhasználó által óránként végrehajtható, bármelyik táblát vagy " "adatbázist módosító parancsok számát." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Korlátozza a felhasználó egyidejű kapcsolatainak számát." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Az összes felhasználó folyamatainak megtekintését engedélyezi" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Nem valósult meg ebben a MySQL verzióban" -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Engedélyezi a szerver beállításainak újratöltését, és a szerver " "gyorsítótárának törlését." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" "Engedélyezi a felhasználónak, hogy megkérdezze, hol találhatók a kisegítő/fő " "helyek." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "A kisegítő helyek másolásához szükséges." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Engedélyezi az adatok olvasását." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Hozzáférést ad az adatbázisok teljes listájához." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Engedélyezi SHOW CREATE VIEW lekérdezések végrehajtását." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Engedélyezi a szerver leállítását." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5153,157 +4838,157 @@ msgstr "" "globális változók beállítása, vagy más felhasználók folyamatainak " "megszüntetése." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Eseményindítók létrehozásának és eldobásának engedélyezése" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Engedélyezi az adatok megváltoztatását." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Nincsenek jogok." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Nincs" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Táblaspecifikus jogok" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Megjegyzés: a MySQL jognevek az angolból származnak." -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Globális jogok" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Adatbázis-specifikus jogok" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Adminisztráció" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Erőforrás-korlátozások" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" "Megjegyzés: Ezen beállítások 0-ra (nulla) állítása eltávolítja a korlátozást." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Bejelentkezési adatok" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Nincs jelszó megváltoztatás" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Nem található(k) a felhasználó(k)." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "%s felhasználó már létezik!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Az új felhasználó hozzáadása megtörtént." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Ön frissítette %s jogait." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "%s jogainak visszavonása megtörtént" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "%s jelszavának megváltoztatása sikerült." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "%s törlése" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Nincs törlésre kijelölt felhasználó!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "A jogok újratöltése" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "A kiválasztott felhasználók törlése sikerült." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "A jogok újratöltése sikerült." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Jogok szerkesztése" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Visszavonás" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Felhasználók áttekintése" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Engedélyezés" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Bármi" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Új felhasználó hozzáadása" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "A kijelölt felhasználók törlése" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "A felhasználók összes jogának visszavonása, majd törlése." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "A felhasználókéval azonos nevű adatbázisok eldobása." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5316,94 +5001,94 @@ msgstr "" "használt jogoktól, ha a módosításuk kézzel történt. Ebben az esetben %" "stöltse be újra a jogokat%s a folytatás előtt." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Nem található a kiválasztott felhasználó a privilégium táblában." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Oszlopspecifikus jogok" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Jogok hozzáadása a következő adatbázison" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "A _ és a % karakterhelyettesítőt \\ jellel kell lezárni, hogy " "szövegkonstansként lehessen őket használni" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Jogok hozzáadása a következő táblán:" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Bejelentkezési adatok módosítása / Felhasználó másolása" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Új felhasználó létrehozása ezekkel a jogokkal, és ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... a régiek megőrzése." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... a régiek törlése a felhasználói táblákból." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... az összes aktív jog visszaállítása a régiekből, majd törlés." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" " ... a régiek törlése a felhasználói táblákból, majd a jogok újratöltése." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Adatbázis a felhasználó számára" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Nincs" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Azonos nevű adatbázis létrehozása, és az összes jog engedélyezése" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Az összes jog engedélyezése karakterhelyettesítős néven (username\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "Az összes jog engedélyezése a(z) "%s" adatbázison" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "A(z) "%s" adatbázishoz hozzáférhető felhasználók" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "globális" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "adatbázis-specifikus" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "karakterhelyettesítő" @@ -8371,25 +8056,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "A beszúrt sor azonosítószáma: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Megjelenítés PHP kódként" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Megjelenítés SQL lekérdezésként" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Probléma a(z) `%s` tábla indexeivel" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Név" @@ -8442,13 +8127,6 @@ msgstr "" msgid "Show insert query" msgstr "Megjelenítés SQL lekérdezésként" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "és utána" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Vissza az előző oldalra" @@ -8531,7 +8209,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Hozzáadás az index  %s oszlophoz" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Az oszlopok számának nullánál nagyobbnak kell lennie." @@ -8645,41 +8323,6 @@ msgstr "Hivatkozási sértetlenség ellenőrzése:" msgid "Show tables" msgstr "A táblák megjelenítése" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Területhasználat" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Méret" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Hatályos" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Sorstatisztika" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Utasítások" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "statikus" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinamikus" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Sor hossza" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Területhasználat" @@ -8713,7 +8356,6 @@ msgid "Row length" msgstr "Sor hossza" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Sor mérete " @@ -8791,50 +8433,50 @@ msgstr "Nincs" msgid "Column %s has been dropped" msgstr "A(z) %s tábla eldobása megtörtént" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Az elsődleges kulcs hozzáadása a(z) %s mezőn megtörtént" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Az index hozzáadása a(z) %s mezőn megtörtént" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Kapcsolat nézete" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Táblaszerkezet ajánlása" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "%s mező hozzáadása" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "A tábla végén" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "A tábla elején" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "%s után" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Index készítése a(z) %s. oszlopon" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "particionált" @@ -8876,6 +8518,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -9298,6 +8944,9 @@ msgstr "Tábla átnevezése" #~ msgid "Process list" #~ msgstr "Folyamatlista" +#~ msgid "Reload privileges" +#~ msgstr "Jogok újratöltése" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/id.po b/po/id.po old mode 100755 new mode 100644 index 13b9184e3..8323c194c --- a/po/id.po +++ b/po/id.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-06-16 01:45+0200\n" "Last-Translator: \n" "Language-Team: indonesian \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Tampilkan semua" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Cari" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Go" @@ -114,7 +94,7 @@ msgstr "gunakan nilai ini" msgid "Database %1$s has been created." msgstr "Database %1$s telah dibuat." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Komentar Database: " @@ -139,17 +119,10 @@ msgstr "Kolom" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Jenis" @@ -162,7 +135,7 @@ msgstr "Jenis" msgid "Null" msgstr "Kosong" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -186,24 +159,18 @@ msgstr "Link ke" msgid "Comments" msgstr "Komentar" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Tidak" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -212,15 +179,9 @@ msgstr "Tidak" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -239,143 +200,127 @@ msgstr "Tampilkan Dump (Skema) dari database" msgid "No tables found in database." msgstr "Tidak ada tabel dalam database." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Pilih semua" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Unselect semua" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Nama database kosong!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Nama database %s telah diubah menjadi %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Database %s telah disalin ke %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Ubah nama database menjadi" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Perintah" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "selanjutnya" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Salin database ke" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Struktur saja" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Struktur dan data" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Data saja" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CIPTAKAN DATABASE sebelum menyalin" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Tambah %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Menambahkan nilai AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Menambahkan pembatas" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Pindah ke database yang disalin" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "Repositori BLOB" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Status" -<<<<<<< HEAD -#: db_operations.php:559 -======= #: db_operations.php:548 ->>>>>>> origin/master msgctxt "BLOB repository" msgid "Enabled" msgstr "Diaktifkan" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Tidak aktif" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Rusak" -#: db_operations.php:577 +#: db_operations.php:566 msgctxt "BLOB repository" msgid "Repair" msgstr "Perbaiki" -<<<<<<< HEAD -#: db_operations.php:585 -======= #: db_operations.php:574 ->>>>>>> origin/master msgctxt "BLOB repository" msgid "Disabled" msgstr "Tidak diaktifkan" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Aktif" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Penyortiran" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -384,14 +329,14 @@ msgstr "" "Fasilitas penambahan untuk bekerja dengan tabel yang di-link di nonaktifkan. " "Untuk mengetahui sebabnya silakan klik %sdisini%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Ubah halaman PDF" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -400,11 +345,7 @@ msgstr "Tabel" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Baris" @@ -412,42 +353,30 @@ msgstr "Baris" msgid "Size" msgstr "Ukuran" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "sedang digunakan" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Pembuatan" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Update terakhir" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Pemeriksaan terakhir" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -507,11 +436,7 @@ msgstr "Hapus" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Atau" @@ -541,124 +466,120 @@ msgstr "Gunakan tabel" msgid "SQL query on database %s:" msgstr "Pencarian SQL dalam database %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Jalankan pencarian SQL" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Akses ditolak" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "sekurang-kurangnya salah satu kata" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "seluruh kata" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "kata-kata tepat" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "sebagai regular expression" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Hasil pencarian untuk \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s catatan dalam tabel %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Browse" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Hapus" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Jumlah: %s rekord" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Cari dalam database" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Kata atau nilai untuk dicari (wildcard: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Cari:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Kata dipisahkan oleh karakter spasi (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Cari dalam tabel:" -<<<<<<< HEAD -#: db_search.php:367 -======= #: db_search.php:355 ->>>>>>> origin/master msgid "Inside column:" msgstr "Di dalam kolom:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Sisipkan" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Struktur" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Hapus" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Mengosongkan" @@ -668,25 +589,25 @@ msgstr "Mengosongkan" msgid "Table %s has been emptied" msgstr "Tabel %s telah dikosongkan" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Pandangan %s telah dibubarkan" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Tabel %s telah dihapus" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "Pelacakan aktif" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "Pelacakan tidak aktif." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -695,92 +616,86 @@ msgstr "" "Sebuah view setidaknya mempunyai jumlah kolom berikut. Silahkan lihat %" "sdokumentasi%s" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Gambarkan" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Tiruan" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Jumlah" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s adalah mesin penyimpan utama pada server MySQL ini." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "yang ditandai:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Pilih semua" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Balik pilihan" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Periksa Overheaded" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Pandangan cetak" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Periksa tabel" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimasikan tabel" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Perbaiki tabel" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analisa tabel" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Ekspor" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Kamus Data" @@ -791,10 +706,10 @@ msgstr "Tabel-tabel yang dilacak" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -814,8 +729,8 @@ msgstr "Diperbarui" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Aksi" @@ -849,8 +764,8 @@ msgstr "Struktur snapshot" msgid "Untracked tables" msgstr "Batal lacak tabel" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "Lacak tabel" @@ -929,7 +844,7 @@ msgstr "Penyimpanan telah dihapus." msgid "Showing bookmark" msgstr "Tampilkan bookmark" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "" @@ -1010,297 +925,189 @@ msgstr "Nama Host harus diisi!" msgid "The user name is empty!" msgstr "Nama pengguna masih kosong!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Kata Sandi kosong!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Kata Sandi tidak sama!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Menambahkan pengguna baru" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create version" -msgid "Create User" -msgstr "Membuat versi" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reloading the privileges" -msgid "Reloading Privileges" -msgstr "Reload Hak Istimewa (Privileges)" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Hapus pengguna yang dipilih" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "Tutup" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Batal" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Lokal" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Proses Aktif" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "Oke" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Ubah nama database menjadi" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Database" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Salin database ke" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Perangkat karakter (Charset)" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Tabel wajib mengandung sesedikitnya satu Field." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Buat tabel" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Cari" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Modifikasi telah disimpan" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 #, fuzzy msgid "Relation deleted" msgstr "Tampilan relasi" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 #, fuzzy msgid "Internal relation added" msgstr "Relasi internal" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Kesalahan: Relasi tidak ditambahkan." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Kesalahan: relasi sudah ada." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Kesalahan menyimpan koordinat untuk Perancang." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Ciri-ciri dari General Relation" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Tidak aktif" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Pilih Field untuk ditampilkan" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "tanpa" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Sebelumnya" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Berikutnya" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Jumlah" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Binari" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Maret" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "April" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Mei" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Juni" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Juli" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Agustus" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Oktober" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Januari" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Februari" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Maret" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "April" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1308,178 +1115,178 @@ msgid "May" msgstr "Mei" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Juni" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Juli" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Agustus" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "September" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Oktober" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Nopember" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Desember" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Minggu" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Senin" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Selasa" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Jumat" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Minggu" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Senin" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Selasa" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Rabu" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Kamis" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Jumat" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sabtu" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Minggu" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Senin" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Selasa" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Rabu" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Kamis" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Jumat" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Sabtu" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "Wiki" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "sedang digunakan" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1539,7 +1346,7 @@ msgstr "Indeks" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unik" @@ -1557,7 +1364,7 @@ msgid "Comment" msgstr "Komentar" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1580,8 +1387,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Database" @@ -1748,11 +1555,7 @@ msgstr "Kata Sandi:" msgid "Server Choice" msgstr "Pilihan Server" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Mulai dari sini Cookies harus diaktifkan." @@ -1832,11 +1635,7 @@ msgstr "" "Gagal menggunakan iconv, libiconv atau fungsi recode_string selama ekstensi " "masih dalam keadaan di-load. Periksa kembali konfigurasi PHP." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Jika muncul sebuah halaman kosong, artinya tidak ada " "masalah." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Tidak dapat memuat konfigurasi default dari: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" msgstr "" "Directif $cfg['PmaAbsoluteUri'] WAJIB diset dalam file konfigurasi!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Server" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Disarankan untuk meng-update ke %s versi %s atau lebih baru." @@ -1939,7 +1710,7 @@ msgstr "id" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentasi" @@ -1953,138 +1724,138 @@ msgstr "Pencarian SQL" msgid "MySQL said: " msgstr "MySQL menyatakan: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Terangkan SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Melewati keterangan SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "Kode PHP tidak ditemukan" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Ciptakan kode PHP" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Menyegarkan" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Melewati pengesahan (validation) SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Mengesahkan (validate) SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Mesin" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Jangka Waktu" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Bytes" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "." #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d. %B %Y jam %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s hari, %s jam, %s menit dan %s detik" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Awal" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Sebelumnya" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Terakhir" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Lompat langsung ke database "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2103,7 +1874,7 @@ msgid "Events" msgstr "Kejadian" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Nama" @@ -2131,16 +1902,16 @@ msgstr "Cari berdasarkan data contoh" msgid "Designer" msgstr "Perancang" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 #, fuzzy msgid "Import" msgstr "Ekspor" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Hak Akses" @@ -2161,11 +1932,7 @@ msgstr "" "html#faq3_11@Dokumentasi]FAQ 3.11[/a]" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Kelebihan (Overhead)" @@ -2183,7 +1950,7 @@ msgstr "Server tidak menjawab" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(atau konfigurasi socket dari server MySQL tidak benar)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Rincian..." @@ -2193,36 +1960,22 @@ msgid "Change password" msgstr "Ubah Kata Sandi" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Kata Sandi belum ditetapkan" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Kata Sandi" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Ketik ulang" @@ -2237,20 +1990,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 compatible" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Menghasilkan kata sandi" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Menghasilkan" @@ -2263,17 +2008,23 @@ msgstr "Ciptakan database baru" msgid "Create" msgstr "Ciptakan" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Tidak ada Hak Akses (privilege)" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Tabel wajib mengandung sesedikitnya satu Field." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Ciptakan tabel baru pada database %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of rows per page" msgid "Number of columns" @@ -2336,11 +2087,7 @@ msgid "remember template" msgstr "ingat konvensi" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Penyusunan karakter dalam file:" @@ -2351,7 +2098,7 @@ msgstr "Kompresi" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "tanpa" @@ -2393,11 +2140,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "dari File" @@ -2405,21 +2148,13 @@ msgstr "dari File" msgid "File uploads are not allowed on this server." msgstr "Upload file tidak diizinkan di server ini." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "" "Direktori yang telah ditetapkan untuk meng-upload tidak dapat dihubungi" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "direktori upload pada web-server" @@ -2548,11 +2283,7 @@ msgstr "Urut berdasarkan kunci" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "Operasi" @@ -2624,14 +2355,14 @@ msgstr "Tampilan baris" msgid "total" msgstr "jumlah" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "pencarian membutuhkan waktu %01.4f detik" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Ubah" @@ -2700,11 +2431,7 @@ msgstr "Penggunaan penampungan Buffer" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Jumlah" @@ -2966,11 +2693,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Format" @@ -3042,13 +2765,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Data" @@ -3097,15 +2815,9 @@ msgstr "Tipe MIME" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Host" @@ -3303,7 +3015,7 @@ msgstr "Ekspor isi" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Tabel tidak ditemukan" @@ -3316,7 +3028,7 @@ msgstr "Hasil SQL" msgid "Generated by" msgstr "Diciptakan oleh" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL balikkan hasil kosong (a.k. baris yang kosong)." @@ -3465,20 +3177,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Kunci Utama" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Indeks" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Teks penuh" @@ -3703,6 +3415,10 @@ msgstr "Format ini tidak ada pilihannya" msgid "not OK" msgstr "tidak oke" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "Oke" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Aktif" @@ -3726,7 +3442,7 @@ msgstr "" "Mohon belajari dokumentasi untuk mengetahui cara meng-update tabel " "Column_comments Anda" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Ingat pada pencarian SQL " @@ -3777,13 +3493,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Nama pengguna" @@ -3801,22 +3512,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Variabel" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Nilai" @@ -3834,40 +3537,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Setiap pengguna" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Gunakan text field" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Setiap host" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Lokal" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Host yang ini" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Gunakan Host Table" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3891,7 +3565,6 @@ msgid "Use Host Table" msgstr "Gunakan Host Table" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3926,29 +3599,29 @@ msgstr "" msgid "Servers" msgstr "Server" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Variabel" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Penyusunan Karakter" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Mesin" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Log binari" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Proses Aktif" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3975,51 +3648,51 @@ msgstr "Perbedaan" msgid "Target database" msgstr "Database target" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, fuzzy, php-format msgid "Run SQL query/queries on server %s" msgstr "Melaksanakan perintah SQL pada database %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Melaksanakan perintah SQL pada database %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Nama kolom" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Simpan pencarian SQL ini" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Izinkan semua pengguna untuk mengakses simpanan ini" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Jangan timpahkan pencarian ini dari jendela luar" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Pembatas" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Tampilkan ulang perintah SQL " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Kirim" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Hanya melihat" @@ -4199,13 +3872,13 @@ msgstr "" msgid "Save" msgstr "Simpan" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "Menambahkan %s field(s)" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4403,8 +4076,8 @@ msgstr "Reset" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Pengguna" @@ -4849,117 +4522,117 @@ msgstr "Mesin Penyimpan" msgid "View dump (schema) of databases" msgstr "Tampilkan Dump (skema) dari database" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Menggunakan seluruh Hak Istimewa (Privileges) selain GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Mengizinkan untuk merubah struktur dari tabel yang ada." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Mengizinkan perubahan dan penghapusan dari Routines yang tersimpan." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Mengizinkan untuk menciptakan database dan tabel baru." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Mengizinkan penciptaan Routines yang akan disimpan." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Mengizinkan untuk menciptakan tabel baru." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Mengizinkan untuk menciptakan tabel yang bersifat temporer." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Mengizinkan penciptaan, penghapusan dan perubahan account pengguna." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Mengizinkan untuk menciptakan pandangan baru." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Mengizinkan untuk hapus data." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Mengizinkan untuk hapus database dan tabel." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Mengizinkan untuk hapus tabel." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Mengizinkan eksekusi Routines yang tersimpan." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Mengizinkan untuk impor data dari file dan ekspor data kedalam file." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Mengizinkan untuk menambah pengguna dan Hak Istimewa (Privileges) tanpa " "harus me-reload ulang tabel Hak Istimewa." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Mengizinkan untuk menciptakan dan hapus Indeks." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Mengizinkan untuk tambah dan ganti data." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Mengizinkan untuk mengunci tabel dalam Thread yang lagi berjalan." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Membatasi jumlah koneksi baru yang diperbolehkan untuk setiap pengguna dalam " "batas waktu satu jam." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Membatasi jumlah pencarian (Queries) yang diperbolehkan untuk setiap " "pengguna dalam batas waktu satu jam." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4967,64 +4640,64 @@ msgstr "" "Membatasi jumlah perintah untuk merubah sebuah tabel atau database untuk " "setiap pengguna dalam batas waktu satu jam." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 #, fuzzy msgid "Limits the number of simultaneous connections the user may have." msgstr "" "Membatasi jumlah koneksi baru yang diperbolehkan untuk setiap pengguna dalam " "batas waktu satu jam." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Tidak ada efek dalam versi MySQL yang digunakan." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Mengizinkan untuk reload stelan dari server dan untuk flush cache dari " "server." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" "Memberi hak kepada pengguna untuk menanyakan lokasi dari slaves / masters." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Digunakan untuk replikasi dari slaves." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Mengizinkan untuk baca data." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Memberi akses ke seluruh daftar database." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Mengizinkan pencarian dengan cara SHOW CREATE VIEW." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Mengizinkan untuk shut-down server." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5034,161 +4707,161 @@ msgstr "" "diperlukan untuk hampir semua operasi administratif seperti stelan variabel " "global atau untuk mematikan sebuah Thread yang dimiliki oleh pengguna lain." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "Mengizinkan untuk menciptakan dan hapus Indeks." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Mengizinkan untuk ubah data." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Tanpa Hak Istimewa (Privileges)." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "tanpa" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Hak (privileges) khusus terhadap tabel" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Catatan: Nama privilege MySQL dalam bahasa Ingris " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Hak Istimewa (Privileges) Global" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Hak (privileges) khusus terhadap Database" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administrasi" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Batas dari sumber" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" "Perhatian: Perubahan pilihan ini ke posisi 0 (zero) akan menghapus batas " "yang telah ditentukan." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Informasi Login" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Jangan ubah Kata Sandi" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Pengguna tidak ditemukan." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Pengguna %s telah terdaftar!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Pengguna baru telah ditambahkan." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Hak Akses (privilege) untuk %s telah di-update." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Hak akses untuk %s telah dicabut" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Sukses mengubah Kata Sandi untuk %s ." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Menghapus %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Tidak ada pengguna yang dipilih untuk dihapus!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Reload Hak Istimewa (Privileges)" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Sukses menghapus Pengguna yang dipilih." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Sukses reload Hak Istimewa (Privileges)." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Ubah hak akses (privilege)" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Cabut" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Pandangan Umum Pengguna" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Izin" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Setiap" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Menambahkan pengguna baru" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Hapus pengguna yang dipilih" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Cabut seluruh Hak Istimewa (Privileges) dari pengguna, lantas hapus pengguna " "tsb. dari daftar tabel pengguna." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Hapus database yang memiliki nama yang sama dengan pengguna." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5202,94 +4875,94 @@ msgstr "" "diubah secara manual. Disarankan untuk %sme-reload profil pengguna%s sebelum " "melanjut." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "" "Pengguna yang dipilih tidak ditemukan pada tabel hak (privilege table)." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Hak (privileges) khusus terhadap kolum" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Menambahkan hak (privileges) pada database berikut" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Wildcard _ dan % sebaiknya diakhiri dengan tanda \\ untuk mengunakannya " "secara harfiah" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Menambahkan hak (privileges) pada tabel berikut" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Ubah informasi Login / Salip pengguna" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Ciptakan pengguna baru dengan hak-hak yang sama dan ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... mempertahankan yang lama." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... hapus yang lama dari User Table." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... cabut seluruh hak yang aktif, kemudian hapuskan yang lama." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr " ... hapuskan yang lama dari User Table, kemudian reload hak-hak." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Database untuk pengguna" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "tanpa" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Buat database dengan nama yang sama dan beri semua hak" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Berikan semua hak untuk nama wildcard (pengguna\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "Berikan semua hak untuk database "%s"." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Pengguna memiliki akses ke "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "global" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "database-spesifik" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "wildcard" @@ -7916,25 +7589,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Ditemukan masalah dengan indeks dalam tabel `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Judul" @@ -7987,13 +7660,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "selanjutnya" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "kembali" @@ -8076,7 +7742,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Menambahkan ke indeks  %s kolom" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Perhitungan kolom wajib lebih besar dari nol." @@ -8192,41 +7858,6 @@ msgstr "Cek integriti referensial:" msgid "Show tables" msgstr "Tampilkan tabel" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Penggunaan tempat" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Penggunaan" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Efektif" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Statistik Baris" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Keterangan" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinamis" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Panjangnya baris" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Penggunaan tempat" @@ -8260,7 +7891,6 @@ msgid "Row length" msgstr "Panjangnya baris" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Besarnya baris " @@ -8333,50 +7963,50 @@ msgstr "tanpa" msgid "Column %s has been dropped" msgstr "Tabel %s telah dihapus" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Primary key telah ditambahkan pada %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Indeks telah ditambahkan pada %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Tampilan relasi" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Menganalisa struktur tabel" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "Menambahkan %s field(s)" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Pada Akhir Tabel" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Pada Awal Tabel" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "sisipkan setelah %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Ciptakan indeks pada kolom  %s " -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8420,6 +8050,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "Tutup" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/it.po b/po/it.po old mode 100755 new mode 100644 index 7ecdc7a9a..e4af5b791 --- a/po/it.po +++ b/po/it.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-05-24 21:25+0200\n" "Last-Translator: Fabio \n" "Language-Team: italian \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Mostra tutti" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -43,53 +39,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Cerca" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Esegui" @@ -115,7 +95,7 @@ msgstr "Usa questa opzione" msgid "Database %1$s has been created." msgstr "Il database %1$s è stato creato." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Commento al Database: " @@ -142,17 +122,10 @@ msgstr "Nomi delle colonne" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Tipo" @@ -165,7 +138,7 @@ msgstr "Tipo" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -189,24 +162,18 @@ msgstr "Collegamenti a" msgid "Comments" msgstr "Commenti" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr " No " -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -215,15 +182,9 @@ msgstr " No " #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -242,135 +203,127 @@ msgstr "Visualizza dump (schema) del database" msgid "No tables found in database." msgstr "Non ci sono tabelle nel database." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Seleziona tutto" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Deseleziona tutto" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Il nome del DataBase è vuoto!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Il DataBase %s è stato rinominato in %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Il Database %s è stato copiato in %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Rinomina il DataBase in" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Comando" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "e quindi" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Copia il Database in" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Solo struttura" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Struttura e dati" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Solo dati" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREATE DATABASE prima di copiare" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Aggiungi %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Aggiungi valore AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Aggiungi vincoli" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Passare al Database copiato" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "Repository BLOB" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Stato" -#: db_operations.php:559 +#: db_operations.php:548 msgctxt "BLOB repository" msgid "Enabled" msgstr "Attivato" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Disabilita" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Danneggiato" -#: db_operations.php:577 +#: db_operations.php:566 msgctxt "BLOB repository" msgid "Repair" msgstr "Riparazione" -#: db_operations.php:585 +#: db_operations.php:574 msgctxt "BLOB repository" msgid "Disabled" msgstr "Disabilitato" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Abilita" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Collation" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -379,14 +332,14 @@ msgstr "" "Le caratteristiche aggiuntive sono state disattivate per funzionare con le " "tabelle linkate. Per scoprire perché clicca %squi%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Modifica pagine PDF" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -395,11 +348,7 @@ msgstr "Tabella" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Righe" @@ -407,42 +356,30 @@ msgstr "Righe" msgid "Size" msgstr "Dimensione" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "in uso" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Creazione" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Ultimo cambiamento" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Ultimo controllo" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -503,11 +440,7 @@ msgstr "Elimina" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Oppure" @@ -541,85 +474,85 @@ msgstr "Utilizza tabelle" msgid "SQL query on database %s:" msgstr "SQL-query sul database %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Invia Query" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Accesso negato" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "almeno una delle parole" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "tutte le parole" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "la frase esatta" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "come espressione regolare" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Cerca i risultati per \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s corrisponde/ono nella tabella %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Mostra" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Elimina" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Totale: %s corrispondenza/e" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Cerca nel database" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "parola/e o valore/i da cercare (carattere jolly: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Trova:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Le parole sono separate da spazi (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Nella/e tabella/e:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -627,36 +560,36 @@ msgstr "Campi contenuti:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Inserisci" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Struttura" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Elimina" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Svuota" @@ -666,25 +599,25 @@ msgstr "Svuota" msgid "Table %s has been emptied" msgstr "La tabella %s è stata svuotata" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "La vista %s è stata eliminata" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "La tabella %s è stata eliminata" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "Il tracking è attivo." -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "Il tracking non è attivo." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -693,92 +626,86 @@ msgstr "" "Questa visuale ha, come minimo, questo numero di righe. Per informazioni " "controlla la %sdocumentazione%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Vista" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replicazione" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Totali" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s è il motore di memorizzazione predefinito su questo server MySQL." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Se selezionati:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Seleziona tutti" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Deseleziona tutti" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Controllo addizionale" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Visualizza per stampa" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Controlla tabella" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Ottimizza tabella" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Ripara tabella" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analizza tabella" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Esporta" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Data Dictionary" @@ -789,10 +716,10 @@ msgstr "Controlla tabelle" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -812,8 +739,8 @@ msgstr "Aggiornato" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Azione" @@ -849,8 +776,8 @@ msgstr "Solo struttura" msgid "Untracked tables" msgstr "Controlla tabella" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "Controlla tabella" @@ -937,7 +864,7 @@ msgstr "Il bookmark è stato cancellato." msgid "Showing bookmark" msgstr "Mostrando i segnalibri" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Segnalibro %s creato" @@ -1022,428 +949,320 @@ msgstr "Il nome di host è vuoto!" msgid "The user name is empty!" msgstr "Il nome utente è vuoto!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "La password è vuota!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "La password non coincide!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Aggiungi un nuovo utente" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Crea relazioni" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reloading the privileges" -msgid "Reloading Privileges" -msgstr "Caricamento dei privilegi in corso" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Rimuove gli utenti selezionati" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Annulla" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Carica" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Processi" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Rinomina il DataBase in" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Database" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Copia il Database in" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Set di caratteri" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "la tabella deve avere come minimo un dato." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Crea tabelle" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Cerca" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Le modifiche sono state salvate" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Relazione cancellata" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "Relazione \"FOREIGN KEY\" aggiunta" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Aggiunte relazioni internet" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Errore: relazione non aggiunta." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Errore: relazione già esistente." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Errore nel salvare le coordinate per il Designer." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Caratteristiche Generali di Relazione" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Disabilitata" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Seleziona le chiavi referenziali" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Seleziona Foreign Key" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Seleziona la chiave primaria o una chiave univoca" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Scegli il campo da mostrare" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 msgid "Done" msgstr "Fatto" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 msgid "Prev" msgstr "Precedente" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Prossimo" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 msgid "Today" msgstr "Oggi" -#: js/messages.php:111 +#: js/messages.php:82 msgid "January" msgstr "Gennaio" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "Febbraio" -#: js/messages.php:113 +#: js/messages.php:84 msgid "March" msgstr "Marzo" -#: js/messages.php:114 +#: js/messages.php:85 msgid "April" msgstr "Aprile" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Maggio" -#: js/messages.php:116 +#: js/messages.php:87 msgid "June" msgstr "Giugno" -#: js/messages.php:117 +#: js/messages.php:88 msgid "July" msgstr "Luglio" -#: js/messages.php:118 +#: js/messages.php:89 msgid "August" msgstr "Agosto" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "Setttembre" -#: js/messages.php:120 +#: js/messages.php:91 msgid "October" msgstr "Ottobre" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "Novembre" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "Dicembre" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Gen" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Feb" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Apr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 msgctxt "Short month name" msgid "May" msgstr "Mag" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Giu" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "lug" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "ago" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "set" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "ott" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "nov" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "dic" -#: js/messages.php:151 +#: js/messages.php:122 msgid "Sunday" msgstr "Domenica" -#: js/messages.php:152 +#: js/messages.php:123 msgid "Monday" msgstr "Lunedì" -#: js/messages.php:153 +#: js/messages.php:124 msgid "Tuesday" msgstr "Martedì" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "Mercoledì" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "Giovedì" -#: js/messages.php:156 +#: js/messages.php:127 msgid "Friday" msgstr "Venerdì" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "Sabato" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Dom" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Lun" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Mar" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Mer" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Gio" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Ven" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sab" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 msgid "Su" msgstr "Do" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 msgid "Mo" msgstr "Lu" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 msgid "Tu" msgstr "Ma" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 msgid "We" msgstr "Me" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 msgid "Th" msgstr "Gi" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 msgid "Fr" msgstr "Ve" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 msgid "Sa" msgstr "Sa" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "Wiki" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "Ora" -#: js/messages.php:194 +#: js/messages.php:165 msgid "Minute" msgstr "Minuto" -#: js/messages.php:195 +#: js/messages.php:166 msgid "Second" msgstr "Secondo" @@ -1499,7 +1318,7 @@ msgstr "Indici" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unica" @@ -1517,7 +1336,7 @@ msgid "Comment" msgstr "Commenti" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1542,8 +1361,8 @@ msgstr "" "Gli indici %1$s e %2$s sembrano essere uguali e andrebbero, possibilmente, " "essere rimossi." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Database" @@ -1713,11 +1532,7 @@ msgstr "Password:" msgid "Server Choice" msgstr "Scelta del server" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Da questo punto in poi, i cookie devono essere abilitati." @@ -1801,11 +1616,7 @@ msgstr "" "quanto l'estensione deve essere caricata. Controllare la configurazione del " "PHP." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Se ricevete una pagina bianca, allora è tutto a posto." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "Non posso caricare la configurazione predefinita da: %1$s" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1842,48 +1645,28 @@ msgstr "" "La direttiva $cfg['PmaAbsoluteUri'] DEVE essere impostata nel file " "di configurazione!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "Indice server non valido: %s" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" "Nome host per il server %1$s non valido. Controlla la tua configurazione." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Server" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Metodo di autenticazione settato nella configurazione non valido:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Metodo di autenticazione settato nella configurazione non valido:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Si dovrebbe aggiornare %s alla versione %s o successiva." @@ -1909,7 +1692,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Documentazione" @@ -1923,138 +1706,138 @@ msgstr "query SQL" msgid "MySQL said: " msgstr "Messaggio di MySQL: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Spiega SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Non Spiegare SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "senza codice PHP" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Crea il codice PHP" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Aggiorna" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Non Validare SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Valida SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "In linea" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Profiling" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Tempo" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "B" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EiB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "." #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d %B, %Y at %I:%M %p" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s giorni, %s ore, %s minuti e %s secondi" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Inizio" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Precedente" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Fine" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Passa al database \"%s\"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "La %s funzionalità è affetta da un bug noto, vedi %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2075,7 +1858,7 @@ msgid "Events" msgstr "Eventi" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Nome" @@ -2103,15 +1886,15 @@ msgstr "Query da esempio" msgid "Designer" msgstr "Designer" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Importa" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privilegi" @@ -2130,11 +1913,7 @@ msgid "" msgstr "Può essere approssimato. Vedere FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "In eccesso" @@ -2152,7 +1931,7 @@ msgstr "Il server non risponde" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(o il socket del server locale MySQL non è correttamente configurato)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Dettagli..." @@ -2162,36 +1941,22 @@ msgid "Change password" msgstr "Cambia password" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Nessuna Password" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Password" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Reinserisci" @@ -2204,20 +1969,12 @@ msgid "MySQL 4.0 compatible" msgstr "Compatibile con MySQL 4.0" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Genera Password" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Genera" @@ -2230,17 +1987,23 @@ msgstr "Crea un nuovo database" msgid "Create" msgstr "Crea" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Nessun Privilegio" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "la tabella deve avere come minimo un dato." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Crea una nuova tabella nel database %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2306,11 +2069,7 @@ msgid "remember template" msgstr "ricorda il template" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Set di caratteri del file:" @@ -2321,7 +2080,7 @@ msgstr "Compressione" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Nessuno" @@ -2368,11 +2127,7 @@ msgstr "" msgid "File to import" msgstr "File importato" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Percorso del file" @@ -2380,20 +2135,12 @@ msgstr "Percorso del file" msgid "File uploads are not allowed on this server." msgstr "Non è permesso l'upload dei file su questo server." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "La directory impostata per l'upload non può essere trovata" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "directory di upload del web-server" @@ -2531,11 +2278,7 @@ msgstr "Ordina per chiave" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Opzioni" @@ -2605,14 +2348,14 @@ msgstr "Visualizzazione record " msgid "total" msgstr "Totali" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "La query ha impiegato %01.4f sec" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Modifica" @@ -2682,11 +2425,7 @@ msgstr "Utilizzo del Buffer Pool" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Totale" @@ -2977,11 +2716,7 @@ msgstr "" "più alto." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Formato" @@ -3053,13 +2788,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Dati" @@ -3108,15 +2838,9 @@ msgstr "tipo MIME" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Host" @@ -3312,7 +3036,7 @@ msgstr "Esporta contenuti" msgid "Open new phpMyAdmin window" msgstr "Apri una nuova finestra di PhpMyAdmin" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "Nuova tabella" @@ -3324,7 +3048,7 @@ msgstr "Risultato SQL" msgid "Generated by" msgstr "Generato da" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL ha restituito un insieme vuoto (i.e. zero righe)." @@ -3471,20 +3195,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primaria" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Indice" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Testo completo" @@ -3709,6 +3433,10 @@ msgstr "Questo formato non ha opzioni" msgid "not OK" msgstr "non OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Abilitata" @@ -3732,7 +3460,7 @@ msgstr "" "Prego leggere la documentazione su come aggiornare la vostra tabella " "Column_comments" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Query SQL aggiunte ai preferiti" @@ -3786,13 +3514,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Nome utente" @@ -3812,22 +3535,14 @@ msgstr "Mostra lo stato degli slave" msgid "Slave status" msgstr "Mostra lo stato degli slave" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Variabile" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Valore" @@ -3845,40 +3560,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Qualsiasi utente" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Utilizza campo text" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Qualsiasi host" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Locale" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Questo Host" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Utilizza la Tabella dell'Host" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3902,7 +3588,6 @@ msgid "Use Host Table" msgstr "Utilizza la Tabella dell'Host" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3938,29 +3623,29 @@ msgstr "Lingua non conosciuta : %1$s." msgid "Servers" msgstr "Servers" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Variabili" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Set di caratteri" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Motori" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Log binario" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Processi" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Sincronizza" @@ -3987,51 +3672,51 @@ msgstr "Differenza" msgid "Target database" msgstr "Database di destinazione" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Eseguendo query SQL sul server %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Esegui la/e query SQL sul database %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Nomi delle colonne" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Aggiungi ai preferiti questa query SQL" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Permetti ad ogni utente di accedere a questo bookmark" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Sostituisci segnalibro esistente se con lo stesso nome" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Non sovrascrivere questa query da fuori della finestra" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Delimitatori" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr "Mostra di nuovo questa query" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Invia" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Visualizza solo" @@ -4211,13 +3896,13 @@ msgstr "Definizione Partizioni" msgid "Save" msgstr "Salva" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "Aggiungi %s campo(i)" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4435,8 +4120,8 @@ msgstr "Riavvia" msgid "Protocol version" msgstr "Versione protocollo" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Utente" @@ -4900,115 +4585,115 @@ msgstr "Motori di Memorizzazione" msgid "View dump (schema) of databases" msgstr "Visualizza il dump (schema) dei databases" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Comprende tutti i privilegi tranne GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Permette di alterare la struttura di tabelle esistenti." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Permette l'alterazione e l'eliminazione di routines memorizzate." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Permette di creare nuove tabelle e nuovi databases." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Permette la creazione di routines memorizzate." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Permette di creare nuove tabelle." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Permette di creare tabelle temporanee." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Permette di creare, cancellare e rinominare gli account utente." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Permette la creazione di nuove viste." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Permette di cancellare dati." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Permette di eliminare databases e tabelle." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Permette di eliminare tabelle." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Permette di impostare gli eventi per lo scheduler" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Permette l'esecuzione di routines memorizzate." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Permette di importare dati da e esportare dati in file." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Permette di aggiungere utenti e privilegi senza ricaricare le tabelle dei " "privilegi." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Permette di creare ed eliminare gli indici." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Permette di inserire e sovrascrivere dati." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Permette di bloccare le tabelle per il thread corrente." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Limita il numero di nuove connessioni che un utente può aprire in un'ora." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Limita il numero di query che un utente può mandare al server in un'ora." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5016,61 +4701,61 @@ msgstr "" "Limita il numero di comandi che possono cambiare una tabella o un database " "che un utente può eseguire in un'ora." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Limite di connessioni simultanee che un utente può fare." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Permette di vedere i processi di tutti gli utenti" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Non ha alcun effetto in questa versione di MySQL." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Permette di ricaricare i parametri del server e di resettare la cache del " "server." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" "Accorda il diritto ad un utente di domandare dove sono i masters/slaves." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Necessario per la replicazione degli slaves." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Permette di leggere i dati." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Accorda l'accesso alla lista completa dei databases." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Permette di effettuare query del tipo SHOW CREATE VIEW." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Permette di chiudere il server." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5081,156 +4766,156 @@ msgstr "" "settaggio di variabili globali o la cancellazione dei threads di altri " "utenti." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Permette di creare e di eliminare i triggers" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Permette di cambiare i dati." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Nessun privilegio." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Nessuno" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Privilegi relativi alle tabelle" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr "Nota: i nomi dei privilegi di MySQL sono in Inglese" -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Privilegi globali" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Privilegi specifici al database" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Amministrazione" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Limiti di risorse" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "N.B.: 0 (zero) significa nessun limite." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Informazioni di Login" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Non cambiare la password" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Nessun utente trovato." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "L'utente %s esiste già!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Hai aggiunto un nuovo utente." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Hai aggiornato i permessi per %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Hai revocato i privilegi per %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "La password per l'utente %s è cambiata con successo." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Cancellazione in corso di %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Nessun utente selezionato per la cancellazione!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Caricamento dei privilegi in corso" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Gli utenti selezionati sono stati cancellati con successo." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "I privilegi sono stati ricaricati con successo." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Modifica Privilegi" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Revoca" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Vista d'insieme dell'utente" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Grant" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Qualsiasi" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Aggiungi un nuovo utente" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Rimuove gli utenti selezionati" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Revoca tutti i privilegi attivi agli utenti e dopo li cancella." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Elimina i databases gli stessi nomi degli utenti." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5243,52 +4928,52 @@ msgstr "" "privilegi usati dal server se sono stati fatti cambiamenti manuali. In " "questo caso, Si dovrebbero %srinfrescare i privilegi%s prima di continuare." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "L'utente selezionato non è stato trovato nella tabella dei privilegi." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Privilegi relativi alle colonne" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Aggiungi privilegi sul seguente database" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "I caratteri jolly _ e % dovrebbero essere preceduti da un \\ per l'utilizzo " "letterale" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Aggiungi privilegi sulla seguente tabella" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Cambia le Informazioni di Login / Copia Utente" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Crea un nuovo utente con gli stessi privilegi e ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... mantieni quello vecchio." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... cancella quello vecchio dalla tabella degli utenti." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... revoca tutti i privilegi attivi da quello vecchio e in seguito " "cancellalo." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5296,44 +4981,44 @@ msgstr "" " ... cancella quello vecchio dalla tabella degli utenti e in seguito " "ricarica i privilegi." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Database per l'utente" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Nessuno" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Crea un database con lo stesso nome e concedi tutti i privilegi" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Concedi tutti i privilegi al nome con caratteri jolly (username\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "Garantisci tutti i privilegi per il database "%s"" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Utenti che hanno accesso a \"%s\"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "globale" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "specifico del database" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "wildcard" @@ -8113,25 +7798,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "Inserita riga id: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Mostrando il codice PHP" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Mostrando la query SQL" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Problemi con gli indici della tabella `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Etichetta" @@ -8185,13 +7870,6 @@ msgstr "Inserisci come nuova riga e ignora gli errori" msgid "Show insert query" msgstr "Mostrando la query SQL" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "e quindi" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Indietro" @@ -8274,7 +7952,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Aggiungi all'indice %s colonna/e" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Il contatore delle colonne deve essere superiore a 0." @@ -8388,41 +8066,6 @@ msgstr "Controlla l'integrità delle referenze:" msgid "Show tables" msgstr "Mostra le tabelle" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Spazio utilizzato" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Utilizzo" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Effettivo" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Statistiche righe" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Istruzioni" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinamico" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Lunghezza riga" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Spazio utilizzato" @@ -8456,7 +8099,6 @@ msgid "Row length" msgstr "Lunghezza riga" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "Dimensione riga" @@ -8531,50 +8173,50 @@ msgstr "Nessuno" msgid "Column %s has been dropped" msgstr "La tabella %s è stata eliminata" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Una chiave primaria è stata aggiunta in %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Un indice è stato aggiunto in %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Vedi relazioni" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Proponi la struttura della tabella" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "Aggiungi %s campo(i)" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Alla fine della tabella" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "All'inizio della tabella" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Dopo %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Crea un indice su %s columns" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "partizionato" @@ -8616,6 +8258,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/ja.po b/po/ja.po old mode 100755 new mode 100644 index 6909ac425..284b239f4 --- a/po/ja.po +++ b/po/ja.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 11:22+0200\n" "Last-Translator: Michal \n" "Language-Team: japanese \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "すべて表示" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "検索" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "実行する" @@ -114,7 +94,7 @@ msgstr "この値を利用する" msgid "Database %1$s has been created." msgstr "データベース %1$s を作成しました。" -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "データベースのコメント:" @@ -141,17 +121,10 @@ msgstr "カラム名" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "種別" @@ -164,7 +137,7 @@ msgstr "種別" msgid "Null" msgstr "ヌル(NULL)" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -188,24 +161,18 @@ msgstr "リンク先" msgid "Comments" msgstr "コメント" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "いいえ" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -214,15 +181,9 @@ msgstr "いいえ" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -241,141 +202,133 @@ msgstr "DB のダンプ(スキーマ)表示" msgid "No tables found in database." msgstr "このデータベースにはテーブルがありません" -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "全選択" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "全選択解除" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "データベース名が空です!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "データベース %s を %s にリネームしました" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "データベース %s を %s にコピーしました" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "新しいデータベース名" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "コマンド" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "続いて" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "データベースのコピー先" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "構造のみ" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "構造とデータ" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "データのみ" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "コピーの前に CREATE DATABASE する" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "%s を追加" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "AUTO_INCREMENT 値を追加する" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "制約を追加する" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "コピーしたデータベースに切り替える" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "状態" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "有効" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair" msgctxt "BLOB repository" msgid "Repair" msgstr "修復" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "無効" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "照合順序" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -384,14 +337,14 @@ msgstr "" "リンクテーブルを処理するための追加機能が無効になっています。理由については%s" "こちら%sをご覧ください" -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "PDF ページを編集する" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -400,11 +353,7 @@ msgstr "テーブル" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "行" @@ -412,42 +361,30 @@ msgstr "行" msgid "Size" msgstr "サイズ" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "使用中" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "作成日時" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "最終更新" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "最終検査" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -507,11 +444,7 @@ msgstr "削除" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "または" @@ -545,85 +478,85 @@ msgstr "利用するテーブル" msgid "SQL query on database %s:" msgstr "データベース %s のSQL:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "クエリを実行する" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "アクセスは拒否されました" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "いずれかの単語を含む" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "すべての単語を含む" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "完全一致" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "正規表現" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "\"%s\" の検索結果 %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s 件（テーブル %s)" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "表示" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "削除" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "合計: %s 件" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "データベース内検索" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "検索する単語や値 (ワイルドカード: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "検索条件:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "各単語は空白文字(\" \")で区切ってください" -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "検索するテーブル:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -631,36 +564,36 @@ msgstr "検索するフィールド:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "挿入" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "構造" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "削除" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "空にする" @@ -670,117 +603,111 @@ msgstr "空にする" msgid "Table %s has been emptied" msgstr "テーブル %s を空にしました" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "ビュー %s を破棄しました" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "テーブル %s を削除しました" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "このビューの最低行数。詳しくは%sドキュメント%sをご覧ください。" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "ビュー" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "レプリケーション" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "合計" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s はこの MySQL サーバのデフォルトストレージエンジンです" -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "チェックしたものを:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "すべてチェックする" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "すべてのチェックを外す" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "オーバーヘッドのあるテーブルを確認してください" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "印刷用画面" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "テーブルをチェックする" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "テーブルを最適化する" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "テーブルを修復する" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "テーブルを分析する" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "エクスポート" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "データ辞書" @@ -791,10 +718,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -814,8 +741,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "操作" @@ -849,8 +776,8 @@ msgstr "" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "" @@ -934,7 +861,7 @@ msgstr "ブックマークを削除しました" msgid "Showing bookmark" msgstr "表示中のブックマーク" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "ブックマーク %s を作成しました" @@ -1017,291 +944,182 @@ msgstr "ホスト名が空です!" msgid "The user name is empty!" msgstr "ユーザ名が空です!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "パスワードが空です!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "パスワードが異なっています!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "新しいユーザを追加する" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create" -msgid "Create User" -msgstr "作成" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "特権をリロードする" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "選択したユーザを削除する" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "キャンセル" -#: js/messages.php:57 -#, fuzzy -#| msgid "Log in" -msgid "Loading" -msgstr "ログイン" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "プロセス" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "新しいデータベース名" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "データベース" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "データベースのコピー先" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "文字セット" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "テーブルには最低ひとつのフィールドが必要です" - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "テーブルを作成" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "検索" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "修正を保存しました" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "リレーションを削除しました" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "外部キーを追加しました" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "内部リレーションを追加しました" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "エラー: リレーションを追加できませんでした" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "エラー: リレーションはすでに存在しています" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "デザイナの座標を保存するときにエラーが発生しました" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "一般的なリレーション機能" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "無効" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "参照されているキーを選択" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "外部キーを選択してください" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "主キーまたはユニークキーを選択してください" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "表示するフィールドを選択してください" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "なし" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "前" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "次へ" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "合計" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr " バイナリ" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "8 月" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "9 月" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "10 月" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "11 月" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy msgid "July" msgstr "日" -#: js/messages.php:118 +#: js/messages.php:89 msgid "August" msgstr "" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 msgid "October" msgstr "" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "1 月','2 月','3 月','4 月','5 月','6 月" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "7 月" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "8 月" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "9 月" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1309,179 +1127,179 @@ msgid "May" msgstr "10 月" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "11 月" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 #, fuzzy msgid "Jul" msgstr "日" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "日" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "月" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "火" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "金" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "日" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "月" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "火" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "水" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "木" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "金" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "土" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "日" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "月" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "火" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "水" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "木" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "金" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "土" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "Wiki" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "使用中" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1543,7 +1361,7 @@ msgstr "インデックスサイズ" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "ユニーク" @@ -1561,7 +1379,7 @@ msgid "Comment" msgstr "コメント" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1586,8 +1404,8 @@ msgstr "" "インデックス %1$s と %2$s は同一のもののようです。一方は削除してもよいかもし" "れません。" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "データベース" @@ -1754,11 +1572,7 @@ msgstr "パスワード:" msgid "Server Choice" msgstr "サーバの選択" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "クッキーを有効にしてください" @@ -1839,11 +1653,7 @@ msgstr "" "必要な拡張はロードされているようですが、iconv や libiconv、recode_string の関" "数を利用できません。PHP の設定を確認してください" -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
空白のページが表示されれば問題なしです" -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "デフォルトの設定を読み込めませんでした: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1879,48 +1681,28 @@ msgstr "" "$cfg['PmaAbsoluteUri'] はかならず設定ファイルで設定する必要がありま" "す!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "サーバのインデックスが不正です: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "サーバ %1$s のホスト名が不正です。設定を確認してください" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "サーバ" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "設定ファイルに無効な認証方法が指定されています:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "設定ファイルに無効な認証方法が指定されています:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "%s を %s 以降にアップグレードしてください" @@ -1946,7 +1728,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "ドキュメント" @@ -1960,138 +1742,138 @@ msgstr "実行した SQL" msgid "MySQL said: " msgstr "MySQLのメッセージ: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "EXPLAIN で確認" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "SQL の EXPLAIN 解析をスキップ" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "PHP コードを省略" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "PHP コードの作成" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "再描画" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "SQL の検証をスキップ" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "SQL の検証" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "エンジン" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "プロファイリング" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "時間" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "バイト" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EiB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%Y 年 %B %d 日 %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s 日 %s 時間 %s 分 %s 秒" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "先頭" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "前" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "最後" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr ""%s" データベースに移動" -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "%s の機能には既知のバグがあります。%s をご覧ください" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2112,7 +1894,7 @@ msgid "Events" msgstr "イベント" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "名前" @@ -2140,15 +1922,15 @@ msgstr "クエリ" msgid "Designer" msgstr "デザイナ" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "インポート" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "特権" @@ -2167,11 +1949,7 @@ msgid "" msgstr "正確な数字とは限りません。FAQ 3.11 をご覧ください" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "オーバーヘッド" @@ -2189,7 +1967,7 @@ msgstr "サーバが応答しません" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(あるいはローカルの MySQL サーバのソケットが正しく設定されていません)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "詳細..." @@ -2199,36 +1977,22 @@ msgid "Change password" msgstr "パスワードを変更する" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "パスワードなし" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "パスワード" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "もう一度入力してください" @@ -2243,20 +2007,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 互換" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "パスワードを生成する" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "生成する" @@ -2269,17 +2025,23 @@ msgstr "新規データベースを作成する" msgid "Create" msgstr "作成" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "特権なし" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "テーブルには最低ひとつのフィールドが必要です" + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "データベース %s に新しいテーブルを作成する" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2346,11 +2108,7 @@ msgid "remember template" msgstr "テンプレートを記憶させる" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "ファイルの文字セット:" @@ -2361,7 +2119,7 @@ msgstr "圧縮" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "なし" @@ -2403,11 +2161,7 @@ msgstr "" msgid "File to import" msgstr "インポートするファイル" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "テキストファイルの位置" @@ -2415,20 +2169,12 @@ msgstr "テキストファイルの位置" msgid "File uploads are not allowed on this server." msgstr "このサーバではファイルのアップロードはできません" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "指定したアップロードディレクトリが利用できません" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "ウェブサーバ上のアップロードディレクトリ" @@ -2563,11 +2309,7 @@ msgstr "キーでソート" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "オプション" @@ -2637,14 +2379,14 @@ msgstr "表示中の列" msgid "total" msgstr "合計" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "クエリの実行時間 %01.4f 秒" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "変更" @@ -2714,11 +2456,7 @@ msgstr "バッファプールの使用量" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "合計" @@ -3001,11 +2739,7 @@ msgstr "" "の番号がつけられます。" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "フォーマット" @@ -3077,13 +2811,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "データ" @@ -3132,15 +2861,9 @@ msgstr "MIME タイプ" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "ホスト" @@ -3335,7 +3058,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "別ウィンドウで開く" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "" @@ -3347,7 +3070,7 @@ msgstr "SQL の結果" msgid "Generated by" msgstr "生成環境" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "返り値が空でした(行数0)" @@ -3495,20 +3218,20 @@ msgstr "全角カナへ変換する" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "主" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "インデックス" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "全文" @@ -3733,6 +3456,10 @@ msgstr "この書式にはオプションはありません" msgid "not OK" msgstr "Not OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "有効" @@ -3754,7 +3481,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "column_comments テーブルの更新方法についてはドキュメントをご覧ください" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "ブックマークされている SQL" @@ -3805,13 +3532,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "ユーザ名" @@ -3828,22 +3550,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "変数" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "値" @@ -3861,40 +3575,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "すべてのユーザ" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "テキストフィールドの値を利用する" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "すべてのホスト" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "ローカル" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "このホスト" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "ホストテーブルを使う" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3918,7 +3603,6 @@ msgid "Use Host Table" msgstr "ホストテーブルを使う" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3952,29 +3636,29 @@ msgstr "言語ファイルが登録されていません: %1$s" msgid "Servers" msgstr "サーバ" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "変数" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "文字セット" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "エンジン" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "バイナリログ" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "プロセス" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -4001,51 +3685,51 @@ msgstr "" msgid "Target database" msgstr "" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "サーバ %s 上でクエリを実行する" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "データベース %s 上でクエリを実行する" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "カラム名" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "この SQL をブックマークする" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "すべてのユーザがこのブックマークを利用できるようにする" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "同名のブックマークは差し替える" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "他のウィンドウからクエリを上書きすることはできません" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "デリミタ" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " 実行したクエリをここに表示する" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "実行する" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "表示のみ" @@ -4220,13 +3904,13 @@ msgstr "パーティションの定義" msgid "Save" msgstr "保存する" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "%s 個のフィールドを追加する" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4438,8 +4122,8 @@ msgstr "リセット" msgid "Protocol version" msgstr "プロトコルバージョン" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "ユーザ" @@ -4890,169 +4574,169 @@ msgstr "ストレージエンジン" msgid "View dump (schema) of databases" msgstr "データベースのダンプ(スキーマ)表示" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "GRANT 以外のすべての特権を付与する" -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "既存のテーブル構造の変更を許可する" -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "ストアドルーチンの修正と削除を許可する" -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "新しいデータベースやテーブルの作成を許可する" -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "ストアドルーチンの作成を許可する" -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "新しいテーブルの作成を許可する" -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "一時テーブルの作成を許可する" -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "ユーザアカウントの作成・削除・リネームを許可する" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "新しいビューの作成を許可する" -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "データの削除を許可する" -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "データベースとテーブルの削除を許可す" -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "テーブルの削除を許可する" -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "イベントスケジューラにイベントを設定できるようにする" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "ストアドルーチンの実行を許可する" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "データのインポート、エクスポートを許可する" -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "特権テーブルのリロードなしのユーザ・特権の追加を許可する" -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "インデックスの作成、削除を許可する" -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "データの挿入、置換を許可する" -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "現在のスレッドのテーブルロックを許可する" -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "単位時間内に可能な新規接続回数を制限する" -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "単位時間内にサーバに送信可能なクエリ数を制限する" -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." msgstr "" "単位時間内に実行可能なテーブルないしデータベースの編集コマンド数を制限する" -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "ユーザの同時接続数を制限する" -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "全ユーザのプロセスを閲覧できるようにする" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "このバージョンの MySQL では無効です" -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "サーバ設定のリロード、サーバキャッシュのフラッシュを許可する" -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "スレーブ/マスターの照会を許可する" -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "レプリケーションスレーブでは有効にする必要があります" -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "データの読み込みを許可する" -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "データベース総一覧へのアクセスを許可する" -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "SHOW CREATE VIEW クエリの実行を許可する" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "サーバのシャットダウンを許可する" -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5062,156 +4746,156 @@ msgstr "" "ザのスレッドを停止するといった管理操作をする場合はたいていこの設定が必要にな" "ります" -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "トリガの作成・削除を許可する" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "データの修正を許可する" -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "特権はありません" -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "なし" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "テーブル固有の特権" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr "注意: MySQL の特権名は英語で表示されます" -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "グローバル特権" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "データベースに固有の特権" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "管理" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "リソースの制限" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "注意: オプションを 0 (ゼロ)に設定すると制限を解除します" -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "ログイン情報" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "パスワードは変更しない" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "ユーザが存在しません" -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "ユーザ %s は既に存在します!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "新しいユーザを追加しました" -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "%s の特権を更新しました" -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "%s の特権を取り消しました" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "%s のパスワードは正しく変更されました" -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "%s を削除中です" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "削除するユーザが選択されていません!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "特権をリロードしています" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "選択したユーザを正しく削除しました" -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "特権を正常にリロードしました" -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "特権を編集" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "取り消し" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "ユーザ概略" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "権限委譲" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "すべて" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "新しいユーザを追加する" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "選択したユーザを削除する" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "特権をすべて取り消してユーザを削除する" -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "ユーザと同名のデータベースを削除する" -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5224,91 +4908,91 @@ msgstr "" "特権の内容が一致しなくなることがありますので、作業を続ける前に %s特権リロー" "ド%s をしてください" -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "特権テーブルには選択したユーザがいません" -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "このカラムに固有の特権" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "データベースに特権を追加" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "テーブルに特権を追加" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "ログイン情報の変更 / ユーザの複製" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "同じ特権を持つ新しいユーザを作る" -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "元のユーザも残す" -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr "ユーザテーブルから元のユーザを削除する" -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "元のユーザの特権をすべて無効にしてから削除する" -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "ユーザテーブルから元のユーザを削除し、特権をリロードする" -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "ユーザ専用データベース" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "なし" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "同名のデータベースを作成してすべての特権を与える" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "ワイルドカード(ユーザ名_%)に該当するデータベースにすべての特権を与える" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr ""%s" にアクセスできるユーザ" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "グローバル" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "データベース固有" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "ワイルドカード" @@ -7989,25 +7673,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "id %1$d の行を挿入しました" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "PHP コードとして表示" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "SQL クエリを表示" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "テーブル `%s` のインデックスに問題があります" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "ラベル" @@ -8059,13 +7743,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "続いて" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "前のページに戻る" @@ -8148,7 +7825,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "インデックスに %s  の列を追加しました" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "カラム数は 0 より大きくなければいけません" @@ -8262,41 +7939,6 @@ msgstr "参照整合性の確認:" msgid "Show tables" msgstr "テーブルを表示する" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "ディスク使用量" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "使用量" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "有効" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "行の統計" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "ステートメント" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "動的" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "行の長さ" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "ディスク使用量" @@ -8330,7 +7972,6 @@ msgid "Row length" msgstr "行の長さ" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " 行のサイズ " @@ -8405,50 +8046,50 @@ msgstr "なし" msgid "Column %s has been dropped" msgstr "テーブル %s を削除しました" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "%s に主キーを追加しました" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "%s にインデックスを追加しました" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "リレーションビュー" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "テーブル構造を確認する" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "%s 個のフィールドを追加する" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "テーブルの末尾" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "テーブルの先頭" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "指定カラムの後に %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr " %s  のカラムにインデックスを作成する" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "パーティション有り" @@ -8490,6 +8131,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8857,6 +8502,9 @@ msgstr "" #~ msgid "Process list" #~ msgstr "プロセス一覧" +#~ msgid "Reload privileges" +#~ msgstr "特権をリロードする" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/ka.po b/po/ka.po old mode 100755 new mode 100644 index e39ada48e..686e6e817 --- a/po/ka.po +++ b/po/ka.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: georgian \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "ყველას ჩვენება" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "ძებნა" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "გადასვლა" @@ -113,7 +93,7 @@ msgstr "გამოიყენე ეს ველი" msgid "Database %1$s has been created." msgstr "შეიქმნა მონაცემთა ბაზა %1$s." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "მონაცემთა ბაზის კომენტარი: " @@ -140,17 +120,10 @@ msgstr "სვეტების სახელები" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "ტიპი" @@ -163,7 +136,7 @@ msgstr "ტიპი" msgid "Null" msgstr "ნული" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -187,24 +160,18 @@ msgstr "Links to" msgid "Comments" msgstr "კომენტარები" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "არა" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -213,15 +180,9 @@ msgstr "არა" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -240,141 +201,133 @@ msgstr "View dump (schema) of database" msgid "No tables found in database." msgstr "No tables found in database." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "ყველას მონიშნვა" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "მონიშნვის მოხსნა" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "მონაცემთა ბაზა ცარიელია!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Database %s has been renamed to %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Database %s has been copied to %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Rename database to" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "ბრძანება" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "და შემდეგ" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Copy database to" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "მხოლოდ სტრუქტურა" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "სტრუქტურა და მონაცემები" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "მხოლოდ მონაცემები" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREATE DATABASE before copying" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Add %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Add AUTO_INCREMENT value" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Add constraints" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Switch to copied database" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "BLOB რეპოზიტორია" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "მდგომარეობა" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "ჩართულია" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "გათიშვა" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "დაზიანებული" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair" msgctxt "BLOB repository" msgid "Repair" msgstr "აღდგენა" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "გათიშულია" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "ჩართვა" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "კოლაცია" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -383,14 +336,14 @@ msgstr "" "The additional features for working with linked tables have been " "deactivated. To find out why click %shere%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "PDF გვერდების რედაქტირება" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -399,11 +352,7 @@ msgstr "ცხრილი" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "სტრიქონები" @@ -411,42 +360,30 @@ msgstr "სტრიქონები" msgid "Size" msgstr "ზომა" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "in use" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "შეიქმნა" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "უკანასკნელი განახლება" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Last check" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -507,11 +444,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "ან" @@ -545,85 +478,85 @@ msgstr "გამოიყენე ცხრილები" msgid "SQL query on database %s:" msgstr "SQL query on database %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "მოთხოვნის გაგზავნა" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "წვდომა აკრძალულია" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "ერთი სიტყვა მაინც" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "ყველა სიტყვა" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "ზუსტი ფრაზა" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "რეგულარული გამოსახულება" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Search results for \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s match(es) inside table %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "არჩევა" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "წაშლა" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Total: %s match(es)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "მონაცემთა ბაზაში ძებნა" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Word(s) or value(s) to search for (wildcard: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "იპოვე:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Words are separated by a space character (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "ცხრილ(ებ)ში:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -631,36 +564,36 @@ msgstr "ველში:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "ჩასმა" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "სტრუქტურა" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Drop" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "ცარიელი" @@ -670,25 +603,25 @@ msgstr "ცარიელი" msgid "Table %s has been emptied" msgstr "Table %s has been emptied" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "View %s has been dropped" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Table %s has been dropped" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -697,92 +630,86 @@ msgstr "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "ხედო" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "რეპლიკაცია" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "ჯამი" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s is the default storage engine on this MySQL server." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "With selected:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "ყველას შემოწმება" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "მონიშნვის მოხსნა ყველასთვის" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Check tables having overhead" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "ხედის ამობეჭდვა" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "ცხრილის შემოწმება" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "ცხრილის ოპტიმიზება" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "ცხრილის აღდგენა" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analyze table" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "ექსპორტი" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "მონაცემების ლექსიკონი" @@ -794,10 +721,10 @@ msgstr "დაბლოკილი ცხრილების გამოტ #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -819,8 +746,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "მოქმედება" @@ -857,8 +784,8 @@ msgstr "მხოლოდ სტრუქტურა" msgid "Untracked tables" msgstr "დაბლოკილი ცხრილების გამოტოვება" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "ცხრილის შემოწმება" @@ -941,7 +868,7 @@ msgstr "The bookmark has been deleted." msgid "Showing bookmark" msgstr "Showing bookmark" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Bookmark %s created" @@ -1024,295 +951,187 @@ msgstr "ჰოსტის სახელი არაა შეყვანი msgid "The user name is empty!" msgstr "მომხმარებლის სახელი ცარიელია!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "პაროლი ცარიელია!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "პაროლები არ ემთხვევა!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "ახალი მომხმარებლის დამატება" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Create relation" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "პრივილეგიების გადატვირთვა" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Remove selected users" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "გაუქმება" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "ჩატვირთვა" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "პროცესები" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Rename database to" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "მონაცემთა ბაზა" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Copy database to" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "სიმბოლოთა ნაკრები" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Table must have at least one field." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "ცხრილის შექმნა" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "ძებნა" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "ცვლილებები შენახულია" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Relation deleted" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "FOREIGN KEY relation added" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Internal relation added" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Error: Relation not added." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Error: relation already exists." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Error saving coordinates for Designer." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "General relation features" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "გათიშულია" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Select referenced key" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Select Foreign Key" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Please select the primary key or a unique key" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "აირჩიეთ საჩვენებელი ველი" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "Donate" msgid "Done" msgstr "შემოწირულობა" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "წინა" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "შემდეგი" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "სულ" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "ბინარული" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "მარ" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "აპრ" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "მაი" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "ივნ" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "ივლ" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "აგვ" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "ოქტ" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "იან" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "თებ" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "მარ" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "აპრ" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1320,178 +1139,178 @@ msgid "May" msgstr "მაი" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "ივნ" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "ივლ" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "აგვ" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "სექ" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "ოქტ" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "ნოე" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "დეკ" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "კვი" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "ორშ" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "სამ" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "პარ" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "კვი" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "ორშ" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "სამ" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "ოთხ" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "ხუთ" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "პარ" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "შაბ" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "კვი" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "ორშ" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "სამ" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "ოთხ" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "ხუთ" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "პარ" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "შაბ" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "ვიკი" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "in use" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1553,7 +1372,7 @@ msgstr "ინდექსები" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "უნიკალური" @@ -1571,7 +1390,7 @@ msgid "Comment" msgstr "კომენტარი" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1596,8 +1415,8 @@ msgstr "" "The indexes %1$s and %2$s seem to be equal and one of them could possibly be " "removed." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "მონაცემთა ბაზები" @@ -1769,11 +1588,7 @@ msgstr "პაროლი:" msgid "Server Choice" msgstr "სერვერის არჩევა" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Cookies must be enabled past this point." @@ -1853,11 +1668,7 @@ msgstr "" "Couldn't use the iconv, libiconv, or recode_string functions, although the " "necessary extensions appear to be loaded. Check your PHP configuration." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
If you receive a blank page, everything " "is fine." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Could not load default configuration from: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1895,48 +1698,28 @@ msgstr "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Invalid server index: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "Invalid hostname for server %1$s. Please review your configuration." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "სერვერი" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Invalid authentication method set in configuration:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Invalid authentication method set in configuration:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "You should upgrade to %s %s or later." @@ -1963,7 +1746,7 @@ msgstr "ka" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "დოკუმენტაცია" @@ -1977,138 +1760,138 @@ msgstr "SQL მოთხოვნა" msgid "MySQL said: " msgstr "MySQL-მა თქვა: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "SQL-ის ახსნა" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Skip Explain SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "PHP კოდის გარეშე" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "PHP კოდის შექმნა" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "განახლება" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Skip Validate SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Validate SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "ძრავები" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Profiling" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "დრო" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "B" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EiB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%B %d, %Y, %I:%M %p" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s დღე, %s საათი, %s წუთი და %s წამი" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "დასაწყისი" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "წინა" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "დასასრული" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Jump to database "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "The %s functionality is affected by a known bug, see %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2129,7 +1912,7 @@ msgid "Events" msgstr "მოვლენები" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "სახელი" @@ -2157,15 +1940,15 @@ msgstr "მოთხოვნა" msgid "Designer" msgstr "შემქნელი" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "შემოტანა" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "პრივილეგიები" @@ -2186,11 +1969,7 @@ msgstr "" "html#faq3_11@Documentation]FAQ 3.11[/a]" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Overhead" @@ -2207,7 +1986,7 @@ msgstr "სერვერი არ პასუხობს" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(or the local MySQL server's socket is not correctly configured)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "დეტალები..." @@ -2217,36 +1996,22 @@ msgid "Change password" msgstr "პაროლის შეცვლა" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "პაროლი არაა" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "პაროლი" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Re-type" @@ -2261,20 +2026,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0-თან თავსებადი" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "პაროლის დაგენერირება" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "დაგენერირება" @@ -2287,17 +2044,23 @@ msgstr "ახალი მონაცემთა ბაზის შექმ msgid "Create" msgstr "შექმნა" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "პრივილეგიები არაა" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Table must have at least one field." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Create new table on database %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2362,11 +2125,7 @@ msgid "remember template" msgstr "remember template" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "სიმბოლოთა ნაკრები ფაილისთვის:" @@ -2377,7 +2136,7 @@ msgstr "შეკუმშვა" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "არაა" @@ -2419,11 +2178,7 @@ msgstr "" msgid "File to import" msgstr "შემოსატანი ფაილი" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Location of the text file" @@ -2431,20 +2186,12 @@ msgstr "Location of the text file" msgid "File uploads are not allowed on this server." msgstr "File uploads are not allowed on this server." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "The directory you set for upload work cannot be reached" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "web server upload directory" @@ -2579,11 +2326,7 @@ msgstr "Sort by key" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "პარამეტრები" @@ -2654,14 +2397,14 @@ msgstr "Showing rows" msgid "total" msgstr "სულ" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "მოთხოვნას დასჭირდა %01.4f წმ" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "შეცვლა" @@ -2731,11 +2474,7 @@ msgstr "Buffer Pool Usage" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "სულ" @@ -3020,11 +2759,7 @@ msgstr "" "number." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "ფორმატი" @@ -3096,13 +2831,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "მონაცემები" @@ -3151,15 +2881,9 @@ msgstr "MIME-ის ტიპი" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "ჰოსტი" @@ -3359,7 +3083,7 @@ msgstr "Export defaults" msgid "Open new phpMyAdmin window" msgstr "phpMyAdmin-ის ახალი ფანჯრის გახსნა" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "ცხრილები არაა" @@ -3372,7 +3096,7 @@ msgstr "SQL-ის შედეგი" msgid "Generated by" msgstr "Generated by" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL returned an empty result set (i.e. zero rows)." @@ -3523,20 +3247,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "პირველადი" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "ინდექსი" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Fulltext" @@ -3761,6 +3485,10 @@ msgstr "ამ ფორმატს არ აქვს პარამეტ msgid "not OK" msgstr "not OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "ჩართულია" @@ -3783,7 +3511,7 @@ msgid "" msgstr "" "Please see the documentation on how to update your column_comments table" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Bookmarked SQL query" @@ -3835,13 +3563,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "მომხმარებლის სახელი" @@ -3861,22 +3584,14 @@ msgstr "Show slave status" msgid "Slave status" msgstr "Show slave status" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "ცვლადი" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "მნიშვნელობა" @@ -3894,40 +3609,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "ნებისმიერი მომხმარებელი" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "გამოიყენე ტექსტური ველი" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "ნებისმიერი ჰოსტი" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "ლოკალური" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "ეს ჰოსტი" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Use Host Table" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3951,7 +3637,6 @@ msgid "Use Host Table" msgstr "Use Host Table" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3985,29 +3670,29 @@ msgstr "უცნობი ენა: %1$s." msgid "Servers" msgstr "სერვერები" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "ცვლადები" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "სიმბოლოთა ნაკრებები" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "ძრავები" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "ბინარული ჟურნალი" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "პროცესები" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -4037,51 +3722,51 @@ msgstr "" msgid "Target database" msgstr "მონაცემთა ბაზაში ძებნა" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Run SQL query/queries on server %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Run SQL query/queries on database %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "სვეტების სახელები" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Bookmark this SQL query" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Let every user access this bookmark" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Replace existing bookmark of same name" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Do not overwrite this query from outside the window" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "გამყოფი" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Show this query here again " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Submit" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "View only" @@ -4258,13 +3943,13 @@ msgstr "PARTITION definition" msgid "Save" msgstr "შენახვა" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "%s ველის დამატება" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4479,8 +4164,8 @@ msgstr "დაბრუნება" msgid "Protocol version" msgstr "ოქმის ვერსია" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "მომხმარებელი" @@ -4940,112 +4625,112 @@ msgstr "Storage Engines" msgid "View dump (schema) of databases" msgstr "View dump (schema) of databases" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "შეიცავს ყველა პრივილეგიას GRANT-ის გამოკლებით." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Allows altering the structure of existing tables." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Allows altering and dropping stored routines." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Allows creating new databases and tables." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Allows creating stored routines." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Allows creating new tables." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Allows creating temporary tables." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Allows creating, dropping and renaming user accounts." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Allows creating new views." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Allows deleting data." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Allows dropping databases and tables." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Allows dropping tables." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Allows to set up events for the event scheduler" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Allows executing stored routines." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Allows importing data from and exporting data into files." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Allows adding users and privileges without reloading the privilege tables." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Allows creating and dropping indexes." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Allows inserting and replacing data." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Allows locking tables for the current thread." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Limits the number of new connections the user may open per hour." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Limits the number of queries the user may send to the server per hour." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5053,58 +4738,58 @@ msgstr "" "Limits the number of commands that change any table or database the user may " "execute per hour." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Limits the number of simultaneous connections the user may have." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Allows viewing processes of all users" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Has no effect in this MySQL version." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "Allows reloading server settings and flushing the server's caches." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Allows the user to ask where the slaves / masters are." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Needed for the replication slaves." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Allows reading data." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Gives access to the complete list of databases." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Allows performing SHOW CREATE VIEW queries." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Allows shutting down the server." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5114,157 +4799,157 @@ msgstr "" "required for most administrative operations like setting global variables or " "killing threads of other users." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Allows creating and dropping triggers" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Allows changing data." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "პრივილეგიები არაა." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "არაა" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Table-specific privileges" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Note: MySQL privilege names are expressed in English " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "გლობალური პრივილეგიები" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Database-specific privileges" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "ადმინისტრირება" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Resource limits" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Note: Setting these options to 0 (zero) removes the limit." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Login Information" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "არ შეცვალო პაროლი" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "მომხმარებლ(ებ)ის პოვნა ვერ მოხერხდა." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "მომხმარებელი %s უკვე არსებობს!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "თქვენ დაამატეთ ახალი მომხმარებელი." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "You have updated the privileges for %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "You have revoked the privileges for %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "The password for %s was changed successfully." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "%s-ის წაშლა" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "No users selected for deleting!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Reloading the privileges" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "The selected users have been deleted successfully." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "The privileges were reloaded successfully." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "პრივილეგიების რედაქტირება" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Revoke" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "მომხმარებლის მიმოხილვა" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Grant" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "ნებისმიერი" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "ახალი მომხმარებლის დამატება" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Remove selected users" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Revoke all active privileges from the users and delete them afterwards." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Drop the databases that have the same names as the users." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5277,49 +4962,49 @@ msgstr "" "server uses, if they have been changed manually. In this case, you should %" "sreload the privileges%s before you continue." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "The selected user was not found in the privilege table." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Column-specific privileges" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "პრივილეგიების დამატება შემდეგი მონაცემთა ბაზისათვის" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "Wildcards % and _ should be escaped with a \\ to use them literally" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "პრივილეგიების დამატება შემდეგი ცხრილისათვის" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Change Login Information / Copy User" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "იგივე პრივილეგიების მქონე ახალი მომხმარებლის შექმნა და ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... ძველის შენახვა." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... ძველი მომხმარებლის მომხმარებლების ცხრილიდან წაშლა." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... revoke all active privileges from the old one and delete it afterwards." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5327,45 +5012,45 @@ msgstr "" " ... ძველი მომხმარებლის მომხმარებლების სიიდან წაშლა და შემდეგ პრივილეგიების " "გადატვირთვა." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "მონაცემთა ბაზა მომხმარებლისთვის" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "არაა" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" "იგივე სახელის მქონე მონაცემთა ბაზის შექმნა და ყველა პრივილეგიის მინიჭება" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Grant all privileges on wildcard name (username\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "ყველა პრივილეგიის მინიჭება მონაცემთა ბაზისთვის "%s"" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Users having access to "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "გლობალულრი" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "database-specific" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "wildcard" @@ -8266,25 +7951,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "ჩამატებული სტრიქონის id: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "PHP კოდის სახით ჩვენება" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Showing SQL query" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Problems with indexes of table `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Label" @@ -8337,13 +8022,6 @@ msgstr "" msgid "Show insert query" msgstr "Showing SQL query" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "და შემდეგ" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "წინა გვერდზე დაბრუნება" @@ -8424,7 +8102,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Add to index  %s column(s)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Column count has to be larger than zero." @@ -8538,41 +8216,6 @@ msgstr "Check referential integrity:" msgid "Show tables" msgstr "ცხრილების ჩვენება" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "ადგილის გამოყენება" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "გამოყენება" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "ეფექტური" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Row Statistics" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Statements" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "სტატიკური" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "დინამიური" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "სტრიქონის სიგრძე" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "ადგილის გამოყენება" @@ -8606,7 +8249,6 @@ msgid "Row length" msgstr "სტრიქონის სიგრძე" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " სტრიქონის ზომა " @@ -8682,50 +8324,50 @@ msgstr "არაა" msgid "Column %s has been dropped" msgstr "Table %s has been dropped" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "A primary key has been added on %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "An index has been added on %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Relation view" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "ცხრილის სტრუქტურის შეთავაზება" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "%s ველის დამატება" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "ცხრილის ბოლოშო" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "ცხრილის დასაწყისში" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "After %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Create an index on %s columns" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "დაყოფილი" @@ -8767,6 +8409,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -9177,6 +8823,9 @@ msgstr "Rename table to" #~ msgid "Process list" #~ msgstr "პროცესების სია" +#~ msgid "Reload privileges" +#~ msgstr "პრივილეგიების გადატვირთვა" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/ko.po b/po/ko.po old mode 100755 new mode 100644 index ec6ae7878..59accde3a --- a/po/ko.po +++ b/po/ko.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-06-16 18:18+0200\n" "Last-Translator: \n" "Language-Team: korean \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "모두 보기" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "검색" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "실행" @@ -113,7 +93,7 @@ msgstr "이 값을 사용합니다" msgid "Database %1$s has been created." msgstr "데이터베이스 %1$s가 생성되었습니다." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "데이터베이스 설명:" @@ -138,17 +118,10 @@ msgstr "컬럼명" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "종류" @@ -161,7 +134,7 @@ msgstr "종류" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -185,24 +158,18 @@ msgstr "링크 대상:" msgid "Comments" msgstr "설명(코멘트)" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr " 아니오 " -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -211,15 +178,9 @@ msgstr " 아니오 " #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -238,143 +199,127 @@ msgstr "데이터베이스의 덤프(스키마) 데이터 보기" msgid "No tables found in database." msgstr "데이터베이스에 테이블이 없습니다." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "모두 선택" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "모두 선택안함" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "데이터베이스명이 없습니다!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "데이터베이스 %s 의 이름을 %s 로 변경하였습니다." -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "데이터베이스 %s 를 %s 로 복사하였습니다." -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "데이터베이스 이름 변경" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "커맨드" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "이어서" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "데이터베이스 복사" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "구조만" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "구조와 데이터 모두" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "데이터만" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "복사 전에 CREATE DATABASE 실행" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "%s 추가" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "AUTO_INCREMENT 값 추가" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "제약조건 추가" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "복사한 테이블로 옮겨감" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "BLOB 저장소" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "상태" -<<<<<<< HEAD -#: db_operations.php:559 -======= #: db_operations.php:548 ->>>>>>> origin/master msgctxt "BLOB repository" msgid "Enabled" msgstr "유효" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "무효" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "손상됨" -#: db_operations.php:577 +#: db_operations.php:566 msgctxt "BLOB repository" msgid "Repair" msgstr "복구" -<<<<<<< HEAD -#: db_operations.php:585 -======= #: db_operations.php:574 ->>>>>>> origin/master msgctxt "BLOB repository" msgid "Disabled" msgstr "무효" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "유효" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "데이터정렬방식" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -383,14 +328,14 @@ msgstr "" "링크 테이블을 처리하는 추가 기능이 비활성화되어 있습니다. 원인을 확인하려면 %" "s여기를 클릭%s하십시오." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "PDF 페이지 편집" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -399,11 +344,7 @@ msgstr "테이블 " #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "행(레코드)" @@ -411,42 +352,30 @@ msgstr "행(레코드)" msgid "Size" msgstr "크기" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "사용중" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "생성" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "업데이트" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "검사" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, php-format msgid "%s table" msgid_plural "%s tables" @@ -505,11 +434,7 @@ msgstr "삭제" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "또는" @@ -539,124 +464,120 @@ msgstr "사용할 테이블" msgid "SQL query on database %s:" msgstr "데이터베이스 %s에 SQL 질의:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "질의 실행" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "접근이 거부되었습니다." -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "아무 단어나" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "모든 단어" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "정확한 문구" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "정규표현식" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "\"%s\"의 검색 결과 %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s 건 일치 (테이블 %s)" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "보기" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "삭제" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "총: %s 건 일치" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "데이터베이스 검색" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "찾을 단어, 값 (와일드카드: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "찾는 방식:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "단어는 스페이스(\" \")로 구분됩니다." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "찾을 테이블:" -<<<<<<< HEAD -#: db_search.php:367 -======= #: db_search.php:355 ->>>>>>> origin/master msgid "Inside column:" msgstr "검색할 컬럼:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "삽입" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "구조" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "삭제" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "비우기" @@ -666,117 +587,111 @@ msgstr "비우기" msgid "Table %s has been emptied" msgstr "테이블 %s 을 비웠습니다" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "뷰 %s가 제거되었습니다." -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "테이블 %s 을 제거했습니다." -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "트래킹이 활성화되었습니다." -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "트래킹이 활성화되어 있지 않습니다." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "계" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s는 이 MySQL 서버의 기본 스토리지 엔진입니다." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "선택한 것을:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "모두 체크" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "모두 체크안함" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "인쇄용 보기" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "테이블 검사" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "테이블 최적화" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "테이블 복구" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "테이블 분석" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "내보내기" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "데이터 사전 (전체 구조보기)" @@ -787,10 +702,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -811,8 +726,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "실행" @@ -848,8 +763,8 @@ msgstr "구조만" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "테이블 검사" @@ -930,7 +845,7 @@ msgstr "북마크를 제거했습니다." msgid "Showing bookmark" msgstr "" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "" @@ -1011,256 +926,117 @@ msgstr "호스트명이 없습니다!" msgid "The user name is empty!" msgstr "사용자명이 없습니다!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "암호가 비었습니다!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "암호가 동일하지 않습니다!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "새 사용자 추가" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "서버 버전" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reloading the privileges" -msgid "Reloading Privileges" -msgstr "사용권한을 갱신합니다(Reloading the privileges)" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "선택한 사용자를 삭제" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Local" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "프로세스 목록" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "데이터베이스 이름 변경" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "데이터베이스" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "데이터베이스 복사" - -#: js/messages.php:68 -msgid "Changing Charset" -msgstr "" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one column." -msgid "Table must have atleast 1 column" -msgstr "테이블은 적어도 1개 이상의 컬럼을 갖고 있어야 합니다." - -#: js/messages.php:70 -#, fuzzy -msgid "Create Table" -msgstr "새 페이지 만들기" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "검색" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "수정된 내용이 저장되었습니다." -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "사용불가" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "출력할 필드 선택" #. l10n: Display text for calendar close link -<<<<<<< HEAD -#: js/messages.php:102 -======= #: js/messages.php:73 ->>>>>>> origin/master msgid "Done" msgstr "완료" #. l10n: Display text for previous month link in calendar -<<<<<<< HEAD -#: js/messages.php:104 -======= #: js/messages.php:75 ->>>>>>> origin/master msgid "Prev" msgstr "이전" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "다음" #. l10n: Display text for current month link in calendar -<<<<<<< HEAD -#: js/messages.php:108 -msgid "Today" -msgstr "오늘" - -#: js/messages.php:111 -======= #: js/messages.php:79 msgid "Today" msgstr "오늘" #: js/messages.php:82 ->>>>>>> origin/master msgid "January" msgstr "1월" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "2월" -<<<<<<< HEAD -#: js/messages.php:113 -msgid "March" -msgstr "3월" - -#: js/messages.php:114 -======= #: js/messages.php:84 msgid "March" msgstr "3월" #: js/messages.php:85 ->>>>>>> origin/master msgid "April" msgstr "4월" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "5월" -<<<<<<< HEAD -#: js/messages.php:116 -msgid "June" -msgstr "6월" - -#: js/messages.php:117 -msgid "July" -msgstr "7월" - -#: js/messages.php:118 -======= #: js/messages.php:87 msgid "June" msgstr "6월" @@ -1270,106 +1046,86 @@ msgid "July" msgstr "7월" #: js/messages.php:89 ->>>>>>> origin/master msgid "August" msgstr "8월" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "9월" -<<<<<<< HEAD -#: js/messages.php:120 -======= #: js/messages.php:91 ->>>>>>> origin/master msgid "October" msgstr "10월" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "11월" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "12월" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "1월" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "2월" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "3월" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "4월" #. l10n: Short month name -<<<<<<< HEAD -#: js/messages.php:134 libraries/common.lib.php:1574 -======= #: js/messages.php:105 libraries/common.lib.php:1565 ->>>>>>> origin/master msgctxt "Short month name" msgid "May" msgstr "5월" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "6월" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "7월" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "8월" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "9월" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "10월" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "11월" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "12월" -<<<<<<< HEAD -#: js/messages.php:151 -msgid "Sunday" -msgstr "일요일" - -#: js/messages.php:152 -msgid "Monday" -msgstr "월요일" - -#: js/messages.php:153 -======= #: js/messages.php:122 msgid "Sunday" msgstr "일요일" @@ -1379,150 +1135,109 @@ msgid "Monday" msgstr "월요일" #: js/messages.php:124 ->>>>>>> origin/master msgid "Tuesday" msgstr "화요일" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "수요일" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "목요일" -<<<<<<< HEAD -#: js/messages.php:156 -======= #: js/messages.php:127 ->>>>>>> origin/master msgid "Friday" msgstr "금요일" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "토요일" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "일" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "월" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "화" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "수" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "목" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "금" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "토" #. l10n: Minimal week day name -<<<<<<< HEAD -#: js/messages.php:177 -======= #: js/messages.php:148 ->>>>>>> origin/master msgid "Su" msgstr "일" #. l10n: Minimal week day name -<<<<<<< HEAD -#: js/messages.php:179 -======= #: js/messages.php:150 ->>>>>>> origin/master msgid "Mo" msgstr "월" #. l10n: Minimal week day name -<<<<<<< HEAD -#: js/messages.php:181 -======= #: js/messages.php:152 ->>>>>>> origin/master msgid "Tu" msgstr "화" #. l10n: Minimal week day name -<<<<<<< HEAD -#: js/messages.php:183 -======= #: js/messages.php:154 ->>>>>>> origin/master msgid "We" msgstr "수" #. l10n: Minimal week day name -<<<<<<< HEAD -#: js/messages.php:185 -======= #: js/messages.php:156 ->>>>>>> origin/master msgid "Th" msgstr "목" #. l10n: Minimal week day name -<<<<<<< HEAD -#: js/messages.php:187 -======= #: js/messages.php:158 ->>>>>>> origin/master msgid "Fr" msgstr "금" #. l10n: Minimal week day name -<<<<<<< HEAD -#: js/messages.php:189 -======= #: js/messages.php:160 ->>>>>>> origin/master msgid "Sa" msgstr "토" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "주" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "시" -<<<<<<< HEAD -#: js/messages.php:194 -msgid "Minute" -msgstr "분" - -#: js/messages.php:195 -======= #: js/messages.php:165 msgid "Minute" msgstr "분" #: js/messages.php:166 ->>>>>>> origin/master msgid "Second" msgstr "초" @@ -1581,7 +1296,7 @@ msgstr "인덱스" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "고유값" @@ -1600,7 +1315,7 @@ msgid "Comment" msgstr "설명(코멘트)" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1623,8 +1338,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "데이터베이스 " @@ -1788,11 +1503,7 @@ msgstr "암호:" msgid "Server Choice" msgstr "서버 선택" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "이 페이지를 넘기려면 쿠키 사용을 허용해야 합니다." @@ -1870,11 +1581,7 @@ msgstr "" "필요한 확장기능이 로드된 것 같지만 iconv, libiconv, 혹은 recode_string 함수" "를 사용할 수 없습니다. PHP 설정을 확인해주십시오." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
만약 아무것도 보이지 않으면, " "정상적인 것입니다." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" msgstr "환경설정 파일에서 $cfg['PmaAbsoluteUri'] 주소를 기입하십시오!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "서버" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "" @@ -1974,7 +1653,7 @@ msgstr "ko" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "문서" @@ -1988,136 +1667,136 @@ msgstr "SQL 질의" msgid "MySQL said: " msgstr "MySQL 메시지: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "SQL 해석" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "해석(EXPLAIN) 생략" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "PHP 코드 없이 보기" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "PHP 코드 보기" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "SQL 검사 생략" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "SQL 검사" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "시간" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "B" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%y-%m-%d %H:%M " -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, fuzzy, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s일 %s시간 %분 %초" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "처음" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "이전" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "마지막" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "데이터베이스 "%s" 로 이동." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2138,7 +1817,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "이름" @@ -2166,16 +1845,16 @@ msgstr "질의 마법사" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 #, fuzzy msgid "Import" msgstr "내보내기" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "사용권한" @@ -2194,11 +1873,7 @@ msgid "" msgstr "" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "부담" @@ -2215,7 +1890,7 @@ msgstr "서버 응답이 없습니다" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2225,36 +1900,22 @@ msgid "Change password" msgstr "암호 변경" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "암호 없음" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "암호" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "재입력" @@ -2267,20 +1928,12 @@ msgid "MySQL 4.0 compatible" msgstr "" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "" @@ -2293,29 +1946,21 @@ msgstr "새 데이터베이스 만들기" msgid "Create" msgstr " 만들기 " -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "권한 없음" -<<<<<<< HEAD -#: libraries/display_create_table.lib.php:47 -======= #: libraries/display_create_table.lib.php:41 msgid "Table must have at least one column." msgstr "테이블은 적어도 1개 이상의 컬럼을 갖고 있어야 합니다." #: libraries/display_create_table.lib.php:48 ->>>>>>> origin/master #, php-format msgid "Create table on database %s" msgstr "데이터베이스 %s에 새로운 테이블을 만듭니다." -<<<<<<< HEAD -#: libraries/display_create_table.lib.php:56 -======= #: libraries/display_create_table.lib.php:57 ->>>>>>> origin/master msgid "Number of columns" msgstr "컬럼수" @@ -2376,11 +2021,7 @@ msgid "remember template" msgstr "템플릿 기억" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "파일 문자셋:" @@ -2391,7 +2032,7 @@ msgstr "압축" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "없음" @@ -2433,11 +2074,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "SQL 텍스트파일의 위치" @@ -2445,20 +2082,12 @@ msgstr "SQL 텍스트파일의 위치" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "업로드 디렉토리에 접근할 수 없습니다" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "웹서버 업로드 디렉토리" @@ -2588,11 +2217,7 @@ msgstr "" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "테이블 작업" @@ -2661,14 +2286,14 @@ msgstr "행(레코드) 보기" msgid "total" msgstr "합계" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "질의 실행시간 %01.4f 초" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "변경" @@ -2735,11 +2360,7 @@ msgstr "" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "전체 사용량" @@ -2985,11 +2606,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Format" @@ -3061,13 +2678,8 @@ msgstr "" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "데이터" @@ -3118,15 +2730,9 @@ msgstr "" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "호스트" @@ -3325,7 +2931,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "테이블이 없습니다" @@ -3338,7 +2944,7 @@ msgstr "SQL 결과" msgid "Generated by" msgstr "" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "결과값이 없습니다. (빈 레코드 리턴.)" @@ -3485,20 +3091,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "기본" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "인덱스" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Fulltext" @@ -3725,6 +3331,10 @@ msgstr "" msgid "not OK" msgstr "" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "사용가능" @@ -3746,7 +3356,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "북마크된 SQL 질의" @@ -3797,13 +3407,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "사용자명" @@ -3821,22 +3426,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "변수" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "값" @@ -3855,40 +3452,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "아무나" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "아무데서나" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Local" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3912,7 +3480,6 @@ msgid "Use Host Table" msgstr "" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3947,30 +3514,30 @@ msgstr "" msgid "Servers" msgstr "서버" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "환경설정값" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 #, fuzzy msgid "Binary log" msgstr "바이너리" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "프로세스 목록" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3999,51 +3566,51 @@ msgstr "" msgid "Target database" msgstr "데이터베이스 검색" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, fuzzy, php-format msgid "Run SQL query/queries on server %s" msgstr "데이터베이스 %s에 SQL 질의를 실행" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "데이터베이스 %s에 SQL 질의를 실행" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "열(칼럼) 이름" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "이 SQL 질의를 북마크함" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " 이 질의를 다시 보여줌 " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "확인" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "View only" @@ -4204,12 +3771,12 @@ msgstr "" msgid "Save" msgstr "저장" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format msgid "Add %s column(s)" msgstr "필드 추가하기" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to add at least one column." @@ -4345,8 +3912,8 @@ msgstr "리세트" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "사용자" @@ -4778,114 +4345,114 @@ msgstr "" msgid "View dump (schema) of databases" msgstr "데이터베이스의 덤프(스키마) 데이터 보기" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "GRANT 이외의 모든 권한을 포함함." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "테이블 구조 변경 허용." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 #, fuzzy msgid "Allows altering and dropping stored routines." msgstr "인덱스 생성 및 삭제 허용." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "DB 및 테이블 생성 허용." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 #, fuzzy msgid "Allows creating stored routines." msgstr "테이블 생성 허용." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "테이블 생성 허용." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "임시테이블 생성 허용." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 #, fuzzy msgid "Allows creating new views." msgstr "테이블 생성 허용." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "데이터 삭제 허용." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "DB 및 테이블 삭제 허용." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "테이블 삭제 허용." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "데이터를 파일에서 가져오기 및 파일로 내보내기 허용." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "권한 테이블을 갱신하지 않고 사용자와 권한 추가하기 허용." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "인덱스 생성 및 삭제 허용." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "데이터 추가(insert) 및 변경(replace) 허용." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "현재 쓰레드에 대한 테이블 잠금(lock) 허용." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Limits the number of new connections the user may open per hour." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Limits the number of queries the user may send to the server per hour." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4893,217 +4460,217 @@ msgstr "" "Limits the number of commands that change any table or database the user may " "execute per hour." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 #, fuzzy msgid "Limits the number of simultaneous connections the user may have." msgstr "Limits the number of new connections the user may open per hour." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "이 버전의 MySQL에는 소용이 없습니다." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "캐시를 비우고 서버를 재시동하는 것을 허용." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "복제서버(replication slaves)에 필요합니다." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "데이터 읽기 허용." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "전체 데이터베이스 목록 접근을 허용" -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "서버 종료 허용." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " "killing threads of other users." msgstr "" -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "인덱스 생성 및 삭제 허용." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "데이터 변경 허용." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "권한 없음." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "없음" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "테이블에 관한 권한" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " 주의: MySQL 권한 이름은 영어로 표기되어야 합니다. " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "전체적 권한" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "데이터베이스에 관한 권한" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "리소스 제한" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "주의: 이 옵션을 0으로 하면 제한이 없어집니다." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "로그인 정보" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "암호를 변경하지 않음" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "사용자가 없습니다." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "사용자 %s 가 이미 존재합니다!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "새 사용자를 추가했습니다." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "%s 의 권한을 업데이트했습니다." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "%s의 권한을 제거했습니다." -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "%s 의 암호가 바뀌었습니다." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr " %s 을 삭제합니다" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "사용권한을 갱신합니다(Reloading the privileges)" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "선택한 사용자들을 삭제했습니다." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "권한을 다시 로딩했습니다." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "권한 수정" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "제거" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "사용자 개요" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 #, fuzzy msgid "Grant" msgstr "인쇄" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Any" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "새 사용자 추가" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "선택한 사용자를 삭제" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "모든 활성화된 권한을 박탈하고 사용자를 삭제함." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "사용자명과 같은 이름의 데이터베이스를 삭제" -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5112,94 +4679,94 @@ msgid "" "sreload the privileges%s before you continue." msgstr "" -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "선택한 사용자는 사용권한 테이블에 존재하지 않습니다." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "열(칼럼)에 관한 권한" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "다음 데이터베이스에 권한 추가하기" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "다음 테이블에 권한 추가하기" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "" -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "" -#: server_privileges.php:2031 +#: server_privileges.php:2009 #, fuzzy msgid " ... delete the old one from the user tables." msgstr "권한 테이블에서 사용자를 삭제하기만 함." -#: server_privileges.php:2032 +#: server_privileges.php:2010 #, fuzzy msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "모든 활성화된 권한을 박탈하고 사용자를 삭제함." -#: server_privileges.php:2033 +#: server_privileges.php:2011 #, fuzzy msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "사용자를 삭제하고 사용권한을 갱신함." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "없음" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "데이터베이스 "%s" 에 대한 사용권한 검사." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr ""%s" 에 접근할 수 있는 사용자들" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "" @@ -7815,25 +7382,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Label" @@ -7885,13 +7452,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "이어서" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "되돌아가기" @@ -7971,7 +7531,7 @@ msgstr "(\"PRIMARY\"는 기본 키만의 유일한 이름입니다!)" msgid "Add to index  %s column(s)" msgstr "%s개 열(칼럼)에 인덱스 추가" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -8087,41 +7647,6 @@ msgstr "referential 무결성 검사:" msgid "Show tables" msgstr "테이블 보기" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "공간 사용량" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "사용법(량)" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "실제량" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "행(레코드) 통계" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "명세" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "동적(다이내믹)" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "행 길이" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "공간 사용량" @@ -8155,7 +7680,6 @@ msgid "Row length" msgstr "행 길이" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Row size " @@ -8226,49 +7750,49 @@ msgstr "없음" msgid "Column %s has been dropped" msgstr "테이블 %s 을 제거했습니다." -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr " %s에 기본 키가 추가되었습니다" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "%s 에 인덱스가 걸렸습니다" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "제안하는 테이블 구조" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy msgid "Add column" msgstr "필드 추가하기" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "테이블의 마지막" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "테이블의 처음" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "%s 다음에" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "%s 개 열(칼럼)에 인덱스 만들기 " -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8310,6 +7834,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/lt.po b/po/lt.po old mode 100755 new mode 100644 index fe6ea680e..3b6b85bd8 --- a/po/lt.po +++ b/po/lt.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-04-16 19:52+0200\n" "Last-Translator: Rytis \n" "Language-Team: lithuanian \n" @@ -20,11 +16,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Rodyti viską" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Paieška" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Vykdyti" @@ -114,7 +94,7 @@ msgstr "Naudokite šią reikšmę" msgid "Database %1$s has been created." msgstr "Duomenų bazė %1$s sukurta." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Duombazės komantaras: " @@ -141,17 +121,10 @@ msgstr "Stulpelių vardai" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Tipas" @@ -164,7 +137,7 @@ msgstr "Tipas" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -188,24 +161,18 @@ msgstr "Sąryšis su" msgid "Comments" msgstr "Komentarai" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Ne" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -214,15 +181,9 @@ msgstr "Ne" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -241,141 +202,133 @@ msgstr "Sukurti, peržiūrėti duombazės atvaizdį" msgid "No tables found in database." msgstr "Duombazėje nerasta lentelių." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Pažymėti visus" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Atžymėti visus" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Nenurodytas duombazės vardas!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Duombazė %s pervadinta į %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Duombazė %s buvo nukopijuota į %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Pervadinti duombazę į" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Komanda" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "ir tada" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Kopijuoti duombazę į" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Tik struktūra" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Struktūra ir duomenys" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Tik duomenys" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREATE DATABASE prieš kopijuojant" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Pridėti %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Pridėti AUTO_INCREMENT reikšmę" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Pridėti apribojimą" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Pereiti į nukopijuotą duombazę" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "BLOB saugykla" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Statusas" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Įjungta" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Išjungti" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Pažeista" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair" msgctxt "BLOB repository" msgid "Repair" msgstr "Taisyti" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Išjungta" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Įjungti" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Palyginimas" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -384,14 +337,14 @@ msgstr "" "Nėra PMA lentelių, kurios leidžia dirbti su jungtinėmis MySQL lentelėmis. %" "sPaaiškinimas%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Redaguoti PDF puslapius" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -400,11 +353,7 @@ msgstr "Lentelė" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Eilutės" @@ -412,42 +361,30 @@ msgstr "Eilutės" msgid "Size" msgstr "Dydis" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "šiuo metu naudojama" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Sukurta" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Paskutinis atnaujinimas" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Paskutinis patikrinimas" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -509,11 +446,7 @@ msgstr "Pakeičiant" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Arba" @@ -547,85 +480,85 @@ msgstr "Naudoti lenteles" msgid "SQL query on database %s:" msgstr "SQL-užklausa duombazėje %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Vykdyti užklausą" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Priėjimas uždraustas" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "bent vienas iš žodžių" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "visi žodžiai" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "ištisa frazė" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "kaip reguliarųjį išsireiškimą" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Paieškos rezultatai frazei \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s atitikmuo(enys) lentelėje %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Peržiūrėti" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Trinti" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Viso: %s atitikmuo(enys)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Paieška duombazėje" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Paieškos žodis(iai) arba reikšmė(ės) (pakaitos simbolis: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Rasti:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Žodžiai atskirti tarpo simboliu (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Lentelės(ių) viduje:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -633,36 +566,36 @@ msgstr "Lentelės(ių) viduje:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Įterpti" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Struktūra" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Šalinti" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Išvalyti" @@ -672,117 +605,111 @@ msgstr "Išvalyti" msgid "Table %s has been emptied" msgstr "Lentelės reikšmės %s ištuštintos" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "View'as %s buvo panaikintas" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Lentelė %s panaikinta" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "View'as" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replikacija" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Sumos" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s yra standartinis saugojimo variklis šiame MySQL serveryje." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Pasirinktus:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Pažymėti visus" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Atžymėti visus" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Pažymėti turinčias perteklių" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Spausdinti struktūrą" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Patikrinti lentelę" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimizuoti" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Redaguoti" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analizuoti lentelę" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Eksportuoti" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Duomenų žodynas" @@ -794,10 +721,10 @@ msgstr "Patikrinti lentelę" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -817,8 +744,8 @@ msgstr "Atnaujinta" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Veiksmas" @@ -854,8 +781,8 @@ msgstr "Tik struktūra" msgid "Untracked tables" msgstr "Patikrinti lentelę" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Patikrinti lentelę" @@ -932,7 +859,7 @@ msgstr "Nuoroda ištrinta." msgid "Showing bookmark" msgstr "" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Žymė %s sukurta" @@ -1012,296 +939,189 @@ msgstr "Tuščias prisijungimo adresas!" msgid "The user name is empty!" msgstr "Tuščias vartotojo vardas!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Tuščias slaptažodis!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Slaptažodžiai nesutampa!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Sukurti naują vartotoją" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Paskutinė versija" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Perkrauti privilegijas" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Pašalinti pažymėtus vartotojus" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "Uždaryti" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Atšaukti" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Lokali darbinė stotis" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Procesai" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "Gerai" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Pervadinti duombazę į" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Duombazė" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Kopijuoti duombazę į" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Koduotė" - -#: js/messages.php:69 -#, fuzzy -#| msgid "You have to choose at least one column to display" -msgid "Table must have atleast 1 column" -msgstr "Pasirinkite bent vieną stulpelį išvedimui" - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Sukurti lentelę" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Paieška" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Pakeitimai išsaugoti" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 #, fuzzy msgid "Relation deleted" msgstr "Peržiūrėti sąryšius" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 #, fuzzy msgid "Internal relation added" msgstr "Vidiniai sąryšiai" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Pagrindinės sąryšių sąvybės" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Išjungta" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Pasirinkite lauką, kurį norite peržiūrėti" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "Donate" msgid "Done" msgstr "Paremti" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Praėjęs" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Sekantis" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Viso" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Dvejetainis" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "kovo" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "balandžio" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "gegužės" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "birželio" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "liepos" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "rugpjūčio" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "spalio" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "sausio" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "vasario" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "kovo" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "balandžio" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1309,178 +1129,178 @@ msgid "May" msgstr "gegužės" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "birželio" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "liepos" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "rugpjūčio" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "rugsėjo" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "spalio" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "lapkričio" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "gruodžio" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Sekmadienis" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Pirmadienis" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Antradienis" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Penktadienis" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Sekmadienis" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Pirmadienis" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Antradienis" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Trečiadienis" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Ketvirtadienis" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Penktadienis" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Šeštadienis" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Sekmadienis" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Pirmadienis" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Antradienis" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Trečiadienis" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Ketvirtadienis" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Penktadienis" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Šeštadienis" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "Wiki" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "šiuo metu naudojama" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1538,7 +1358,7 @@ msgstr "Indeksai" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unikalus" @@ -1556,7 +1376,7 @@ msgid "Comment" msgstr "Komentaras" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1579,8 +1399,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Duombazės" @@ -1752,11 +1572,7 @@ msgstr "Slaptažodis:" msgid "Server Choice" msgstr "Pasirinkti serverį" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Sausainėliai(Cookies) turi būti priimami." @@ -1839,11 +1655,7 @@ msgstr "" "libiconv arba recode_string funkcijomis. Pasitkrinkite PHP " "parinktis. " -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Jeigu " "išvedamas tuščias naršyklės langas - viskas tvarkoje (klaidų nepastebėta)." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Nepavyko užkrauti nustatymų failo iš \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" msgstr "" "Reikia nustatymų faile įrašyti $cfg['PmaAbsoluteUri'] reikšmę!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Serveris" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Rekomenduojame atnaujint %s iki %s ar vėlesnės versijos." @@ -1946,7 +1730,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "?" @@ -1960,136 +1744,136 @@ msgstr "SQL užklausa" msgid "MySQL said: " msgstr "MySQL atsakymas: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Paaiškinti" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Praleisti SQL užklausos aiškinimą" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "be PHP kodo" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "PHP kodas" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Atnaujinti" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Praleisti SQL užklausos tikrinimą" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Patikrinti SQL užklausą" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Laikas" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "B" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EiB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr " " #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%Y m. %B %d d. %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s d., %s val., %s min. ir %s s" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Pradžia" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Praėjęs" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Pabaiga" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Pereiti į "%s" duombazę." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2110,7 +1894,7 @@ msgid "Events" msgstr "Įvykiai" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Pavadinimas" @@ -2139,15 +1923,15 @@ msgstr "SQL užklausa" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Importuoti" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privilegijos" @@ -2166,11 +1950,7 @@ msgid "" msgstr "Gali būti apytikslis. Žiūrėkite DUK 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Perteklius" @@ -2187,7 +1967,7 @@ msgstr "Serveris neatsako" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(arba vietiniai MySQL serverio socketai yra blogai sukonfigūruoti)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Detalės..." @@ -2197,36 +1977,22 @@ msgid "Change password" msgstr "Pakeisti slaptažodį" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Nėra slaptažodžio" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Slaptažodis" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Įveskite dar kartą" @@ -2241,20 +2007,12 @@ msgid "MySQL 4.0 compatible" msgstr "Suderinamas sy MySQL 4.0" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Generuoti Slaiptažodį" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Generuoti" @@ -2267,17 +2025,23 @@ msgstr "Sukurti naują duombazę" msgid "Create" msgstr "Sukurti" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Nėra privilegijų" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "You have to choose at least one column to display" +msgid "Table must have at least one column." +msgstr "Pasirinkite bent vieną stulpelį išvedimui" + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Sukurti naują lentelę duombazėje %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2342,11 +2106,7 @@ msgid "remember template" msgstr "atsiminti šabloną" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Simbolių koduotė faile:" @@ -2357,7 +2117,7 @@ msgstr "Kompresija" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Nėra" @@ -2399,11 +2159,7 @@ msgstr "" msgid "File to import" msgstr "Failas importavimui" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Tekstiniai SQL užklausų failai" @@ -2411,20 +2167,12 @@ msgstr "Tekstiniai SQL užklausų failai" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Nepasiekimas nurodytas www-serverio katalogas atsiuntimams." -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "web serverio katalogas atsiuntimams" @@ -2558,11 +2306,7 @@ msgstr "Rūšiuoti pagal raktą" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Nustatymai" @@ -2633,14 +2377,14 @@ msgstr "Rodomi įrašai" msgid "total" msgstr " iš viso " -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Užklausa užtruko %01.4f sek." #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Redaguoti" @@ -2706,11 +2450,7 @@ msgstr "Buferio Pool'o naudojimas" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Viso" @@ -2967,11 +2707,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Formatas" @@ -3043,13 +2779,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Duomenys" @@ -3098,15 +2829,9 @@ msgstr "MIME tipai" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Darbinė stotis" @@ -3306,7 +3031,7 @@ msgstr "Eksportuoti funkcijas" msgid "Open new phpMyAdmin window" msgstr "Atverti naują phpMyAdmin langą" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "No tables" @@ -3319,7 +3044,7 @@ msgstr "SQL rezultatas" msgid "Generated by" msgstr "Generavo:" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL gražino tuščią rezultatų rinkinį (nėra eilučių)." @@ -3466,20 +3191,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Pirminis" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Indeksas" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Fulltext" @@ -3704,6 +3429,10 @@ msgstr "Šis formatas neturi nustatymų" msgid "not OK" msgstr "Negerai" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "Gerai" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Įjungta" @@ -3727,7 +3456,7 @@ msgstr "" "Informaciją, kaip atnaujinti Column_comments lentelę, galite rasti " "dokumentacijoje." -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Sukurti nuoroda SQL-užklausai" @@ -3779,13 +3508,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Vartotojo vardas" @@ -3802,22 +3526,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Kintamasis" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Reikšmė" @@ -3835,40 +3551,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Bet kurį vartotoją" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Naudokite teksto įvedimo lauką" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Bet kurį prisijungimo adresą" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Lokali darbinė stotis" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Dabartinis serveris" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Naudoti Host lentelę" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3892,7 +3579,6 @@ msgid "Use Host Table" msgstr "Naudoti Host lentelę" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3926,29 +3612,29 @@ msgstr "Nežinoma kalba: %1$s." msgid "Servers" msgstr "Serveriai" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Kintamieji" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Koduotės" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Varikliai" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Binarinis logas" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Procesai" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Sinchronizuoti" @@ -3977,51 +3663,51 @@ msgstr "Skirtumas" msgid "Target database" msgstr "Paieška duombazėje" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, fuzzy, php-format msgid "Run SQL query/queries on server %s" msgstr "Vykdyti SQL sakinius duombazėje %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Vykdyti SQL sakinius duombazėje %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Stulpelių vardai" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Sukurti nuorodą" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Leisti kitiems vartotojams naudotis šia žyme" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Pakeisti jau egzistuojančią žymę tuo pačiu vardu" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Nekeisti šios užklausos už aktyvaus lango ribų." -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Skyriklis" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Rodyti šią užklausą vėl " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Siųsti" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Peržiūra" @@ -4199,13 +3885,13 @@ msgstr "" msgid "Save" msgstr "Išsaugoti" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add column(s)" msgid "Add %s column(s)" msgstr "Pridėti stulpelį(-ius)" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to add at least one column." @@ -4399,8 +4085,8 @@ msgstr "Atstatyti į pradinę būseną" msgid "Protocol version" msgstr "Protokolo versija" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Vartotojas" @@ -4841,116 +4527,116 @@ msgstr "Saugojimo varikliai" msgid "View dump (schema) of databases" msgstr "Peržiūrėti duombazių išrašą" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Įtraukti visas teises, išskyrus GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Leisti keisti jau egzistuojančių lenetelių struktūrą." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 #, fuzzy msgid "Allows altering and dropping stored routines." msgstr "Leisti įterpti ir modifikuoti indeksus." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Leisti kurti naujas duombazes ir lenteles." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 #, fuzzy msgid "Allows creating stored routines." msgstr "Leidžia sukurti naujus view'us." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Leisti kurti naujas lenteles." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Leisti kurti laikinas lenteles." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Leidžia kurti, šalinti ir pervadinti vartotojus." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Leidžia sukurti naujus view'us." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Leisti šalinti duomenis." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Leisti šalinti duombazes ir lenteles." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Leisti šalinti lenteles." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 #, fuzzy msgid "Allows executing stored routines." msgstr "Leidžia sukurti naujus view'us." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Leisti įterpti ir eksportuoti duomenis iš failų." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Leisti įterpti naujus vartotojus, bei prisikirti privilegijas, neperkraunant " "privilegijų lentelės." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Leisti įterpti ir modifikuoti indeksus." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Leisti įterpti ir modifikuoti duomenis." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Leisti užrakinti lenteles procesų metu." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Riboti prisijungimų kiekį per valandą." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Riboti užklausų kiekį per valandą" -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4958,61 +4644,61 @@ msgstr "" "Riboti komandų (kurios vienaip ar kitaip modifikuoja lenteles ar duombazes) " "kiekį per valandą." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 #, fuzzy msgid "Limits the number of simultaneous connections the user may have." msgstr "Riboti prisijungimų kiekį per valandą." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr " Negalioja šioje MySQL versijoje." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Leisti perkrauti darbinę stotį, bei išvalyti laikinąją atmintį (cache)." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" "Leisti vartotojo užklausas dėl atstatymo master / slave darbinių stočių." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Reikalinga atstatyti slave darbinei stočiai" -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Leisti skaityti duomenis." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Suteikti prieigą prie visų duombazių." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Leidžia vykdyti SHOW CREATE VIEW užklausas." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Leisti išjungti serverį." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5022,159 +4708,159 @@ msgstr "" "administratoriaus darbų, tokių kaip globalių reikšmių modifikavimui ar " "vartotojų atjungimui." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "Leisti įterpti ir modifikuoti indeksus." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Leisti modifikuoti duomenis." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Be teisių." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Nėra" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Specifinės lentelių privilegijos" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Pastaba: MySQL privilegijų pavadinimai pateikiami anglų kalba" -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Globalios teisės" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Specifinės duombazių privilegijos" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administracija" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Išteklių apribojimai" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Pastaba: nėra jokių apribojimų jeigu reikšmė nurodyta lygi 0 (nuliui)." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Prisijungimo informacija" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Nekeisti slaptažodžio" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Nerasta vartotojo(ų)." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Vartotojas %s jau yra!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Jūs sukūrėte naują vartotoją." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Jūs pakeitėte privilegijas %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Jūs panaikinote privilegijas %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Vartotojo %s slaptažodis sėkmingai pakeistas." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Šaliname: %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Nepasirinta vartotojų trynimui!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Perkraunamos privilegijos" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Pažymėti vartotojai sėkmingai pašalinti." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Teisės sėkmingai perkrautos." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Redaguoti privilegijas" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Panaikinti" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Vartotojų peržiūra" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Suteikti" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Bet kurį(ią)" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Sukurti naują vartotoją" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Pašalinti pažymėtus vartotojus" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Panaikinti visas aktyvias vartotojų privilegijas ir pašalinti vartotojus." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "" "Pašalinti duombazes, turinčias tokius pačius vardus kaip ir vartotojai." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5186,49 +4872,49 @@ msgstr "" "lentelės. Šiose lentelėse nurodytos teisės gali skirtis nuo nustatymų " "failuose nurodytų teisių. Todėl %sperkraukite teises%s, jeigu norite tęsti. " -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Privilegijų lentelėje pasirinktas vartotojas nerastas." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Specifinės stulpelių privilegijos" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Sukurti privilegijas šiai duombazei" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "Norint naudoti _ ir % simblius, juos reikėtų eskeipinti su \\" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Sukurti privilegijas šiai lentelei" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Pakeisti prisijungimo informaciją / Kopijuoti vartotojo duomenis" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Sukurti naują vartotoją su tom pačiom privilegijom ir ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... palikti seną vartotoją." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... pašalinti seną vartotoją iš vartotojų lentelės." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... panaikinti visas privilegijas iš seno vartotojo ir poto jį pašalinti." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5236,44 +4922,44 @@ msgstr "" " ... pašalinti seną vartotoją iš vartotojų lentelės ir poto perkrauti " "privilegijas" -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Nėra" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "Patikrinti duombazės "%s" privilegijas." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Vartotojai turintys priėjimą prie "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "globalus" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "priklausantis nuo duombazės tipo" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "pakaitos simbolis" @@ -7935,25 +7621,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Rodomas PHP kodas" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Rodoma SQL užklausa" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Iškilo problemos su `%s` lentelės indeksais" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Nuorodos Antraštė" @@ -8006,13 +7692,6 @@ msgstr "Įterpti kaip naują eilutę ir ignoruoti klaidas" msgid "Show insert query" msgstr "Rodoma SQL užklausa" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "ir tada" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Sugrįžti į buvusį puslapį" @@ -8092,7 +7771,7 @@ msgstr "(\"PRIMARY\" yra vienintelis pirminio rakto tipas!)" msgid "Add to index  %s column(s)" msgstr "Įterpti indeksui papildomus  %s stulpelį(ius)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -8208,41 +7887,6 @@ msgstr "Patikrinti sąryšių vientisumą:" msgid "Show tables" msgstr "Rodyti lentelės" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Vietos naudojimas" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Išnaudota" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Efektyvus" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Eilučių statistika" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Parametrai" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinaminis" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Eilutės ilgis" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Vietos naudojimas" @@ -8276,7 +7920,6 @@ msgid "Row length" msgstr "Eilutės ilgis" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "Eilutės dydis" @@ -8348,50 +7991,50 @@ msgstr "Nėra" msgid "Column %s has been dropped" msgstr "Lentelė %s panaikinta" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Stulpeliui %s sukurtas PIRMINIS raktas" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Indeksas sukurtas %s stulpeliui" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Peržiūrėti sąryšius" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Analizuoti lentelės struktūrą" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add column(s)" msgid "Add column" msgstr "Pridėti stulpelį(-ius)" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Lentelės pabaigoje" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Lentelės pradžioje" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Po %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Sukurti indeksą  %s stulpeliui(iams)" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8433,6 +8076,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "Uždaryti" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8806,6 +8453,9 @@ msgstr "Pervadinti lentelę į" #~ msgid "Process list" #~ msgstr "Procesų sąrašas" +#~ msgid "Reload privileges" +#~ msgstr "Perkrauti privilegijas" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/lv.po b/po/lv.po old mode 100755 new mode 100644 index de42c96d6..1bf3c2ac1 --- a/po/lv.po +++ b/po/lv.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:16+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: latvian \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Rādīt visu" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Meklēt" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Aiziet!" @@ -113,7 +93,7 @@ msgstr "Lietot šo vērtību" msgid "Database %1$s has been created." msgstr "Datubāze %s tika izdzēsta." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Datubāzes komentārs: " @@ -140,17 +120,10 @@ msgstr "Kolonnu nosaukumi" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Tips" @@ -163,7 +136,7 @@ msgstr "Tips" msgid "Null" msgstr "Nulle" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -187,24 +160,18 @@ msgstr "Linki uz" msgid "Comments" msgstr "Komentāri" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Nē" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -213,15 +180,9 @@ msgstr "Nē" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -240,142 +201,134 @@ msgstr "Apskatīt datubāzes dampu (shēmu)" msgid "No tables found in database." msgstr "Tabulas nav atrastas šajā datubāzē." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Iezīmēt visu" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Neiezīmēt neko" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Datubāzes nosaukums ir tukšs!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Datubāze %s tika pārsaukta par %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Datubāze %s tika pārkopēta uz %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Pārsaukt datubāzi par" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Komanda" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Kopēt datubāzi uz" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Tikai struktūra" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Struktūra un dati" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Tikai dati" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Pievienot AUTO_INCREMENT vērtību" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Pievienot ierobežojumus" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Pārslēgties uz nokopēto datubāzi" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Statuss" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Ieslēgts" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "Izslēgts" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "Restaurēt tabulu" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Izslēgts" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "Ieslēgts" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Izkārtojumi" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -384,14 +337,14 @@ msgstr "" "Papildiespējas darbam ar saistītām tabulām tika izslēgtas. Lai uzzinātu " "kāpēc, klikškiniet %sšeit%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Labot PDF lapas" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -400,11 +353,7 @@ msgstr "Tabula" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Rindas" @@ -412,42 +361,30 @@ msgstr "Rindas" msgid "Size" msgstr "Izmērs" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "lietošanā" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Izveidošana" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Pēdējā atjaunošana" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Pēdējā pārbaude" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -508,11 +445,7 @@ msgstr "Dzēst" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Vai" @@ -546,85 +479,85 @@ msgstr "Lietot tabulas" msgid "SQL query on database %s:" msgstr "SQL vaicājums uz datubāzes %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Izpildīt vaicājumu" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Pieeja aizliegta" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "kaut viens no vārdiem" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "visi vārdi" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "precīza frāze" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "kā regulārā izteiksme" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Meklēšanas rezultāti \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s rezultāti tabulā %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Apskatīt" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Dzēst" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Kopumā: %s rezultāti" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Meklēt datubāzē" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Vārdi vai vērtības meklēšanai (aizstājējzīme: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Atrast:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Vārdi ir atdalīti ar tukšumu (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Tabulā(s):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -632,36 +565,36 @@ msgstr "Tabulā(s):" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Pievienot" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Struktūra" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Likvidēt" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Iztukšot" @@ -671,118 +604,112 @@ msgstr "Iztukšot" msgid "Table %s has been emptied" msgstr "Tabula %s tika iztukšota" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, fuzzy, php-format msgid "View %s has been dropped" msgstr "Lauks %s tika izdzēsts" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Tabula %s tika izdzēsta" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 #, fuzzy msgid "Replication" msgstr "Relācijas" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Kopumā" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "" -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Ar iezīmēto:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Iezīmēt visu" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Neiezīmēt neko" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Iezīmēt tabulas ar pārtēriņu" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Izdrukas versija" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Pārbaudīt tabulu" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimizēt tabulu" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Restaurēt tabulu" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analizēt tabulu" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Eksports" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Datu vārdnīca" @@ -793,10 +720,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -817,8 +744,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Darbība" @@ -854,8 +781,8 @@ msgstr "Tikai struktūra" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Pārbaudīt tabulu" @@ -932,7 +859,7 @@ msgstr "Ieraksts tika dzēsts." msgid "Showing bookmark" msgstr "" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "" @@ -1012,294 +939,189 @@ msgstr "Hosts nav norādīts!" msgid "The user name is empty!" msgstr "Lietotāja vārds nav norādīts!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Parole nav norādīta!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Paroles nesakrīt!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Pievienot jaunu lietotāju" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Servera versija" - -#: js/messages.php:48 -#, fuzzy -msgid "Reloading Privileges" -msgstr "Globālās privilēģijas" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Dzēst izvēlētos lietotājus" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Lokāls" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Procesi" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "Labi" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Pārsaukt datubāzi par" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Datubāze" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Kopēt datubāzi uz" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Kodējums" - -#: js/messages.php:69 -#, fuzzy -#| msgid "You have to choose at least one column to display" -msgid "Table must have atleast 1 column" -msgstr "Izvēlieties vismaz vienu kolonnu attēlošanai" - -#: js/messages.php:70 -#, fuzzy -msgid "Create Table" -msgstr "Izveidot jaunu lapu" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Meklēt" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Labojumi tika saglabāti" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 #, fuzzy msgid "Relation deleted" msgstr "Relāciju pārskats" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 #, fuzzy msgid "Internal relation added" msgstr "Iekšējās relācijas" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Galvenās relāciju īpašības" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Izslēgts" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Izvēlieties, kuru lauku rādīt" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "Nav" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Iepriekšējie" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Nākamie" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Kopā" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Binārais" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Mar" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Apr" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Mai" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Jūn" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Jūl" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Aug" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Okt" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Jan" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Feb" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Apr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1307,176 +1129,176 @@ msgid "May" msgstr "Mai" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Jūn" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Jūl" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Aug" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Sep" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Okt" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Nov" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Dec" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Sv" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "P" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "O" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Pk" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Sv" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "P" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "O" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "T" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "C" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Pk" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "S" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Sv" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "P" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "O" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "T" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "C" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Pk" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "S" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "lietošanā" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1534,7 +1356,7 @@ msgstr "Indeksi" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unikālais" @@ -1553,7 +1375,7 @@ msgid "Comment" msgstr "Komentāri" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1576,8 +1398,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Datubāzes" @@ -1745,11 +1567,7 @@ msgstr "Parole:" msgid "Server Choice" msgstr "Servera izvēle" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "\"Cookies\" ir jābūt atļautiem aiz šī punkta." @@ -1831,11 +1649,7 @@ msgstr "" "Nevar lietot iconv, libiconv vai recode_string funkciju, bet php saka, ka " "paplašinājums ir ielādēts. Pārbaudiet php konfigurāciju." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Ja redzat tukšu lapu, viss ir kārtībā." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1871,47 +1677,27 @@ msgstr "" "$cfg['PmaAbsoluteUri'] direktīvai ir JĀBŪT nodefinētai Jūsu " "konfigurācijas failā!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Serveris" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Jums ir jāuzliek %s %s vai jaunāks." @@ -1939,7 +1725,7 @@ msgstr "Nosūtīts" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentācija" @@ -1953,136 +1739,136 @@ msgstr "SQL vaicājums" msgid "MySQL said: " msgstr "MySQL teica: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Izskaidrot SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Neizskaidrot SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "Bez PHP koda" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Izveidot PHP kodu" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Atjaunot" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Nepārbaudīt SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Pārbaudīt SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Laiks" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "baiti" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr " " #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d.%m.%Y %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s dienas, %s stundas, %s minūtes un %s sekundes" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Sākums" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Iepriekšējie" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Beigas" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "pāriet pie datubāzes "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2102,7 +1888,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Nosaukums" @@ -2130,16 +1916,16 @@ msgstr "Vaicājums pēc parauga" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 #, fuzzy msgid "Import" msgstr "Eksports" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privilēģijas" @@ -2158,11 +1944,7 @@ msgid "" msgstr "Var būt aptuvens skaits. Skatīt FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Pārtēriņš" @@ -2179,7 +1961,7 @@ msgstr "Serveris neatbild" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2189,36 +1971,22 @@ msgid "Change password" msgstr "Mainīt paroli" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Nav paroles" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Parole" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Atkārtojiet" @@ -2233,20 +2001,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 savietojams" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master #, fuzzy msgid "Generate" msgstr "Uzģenerēja" @@ -2260,17 +2020,23 @@ msgstr "Izveidot jaunu datubāzi" msgid "Create" msgstr "Izveidot" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Nav privilēģiju" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "You have to choose at least one column to display" +msgid "Table must have at least one column." +msgstr "Izvēlieties vismaz vienu kolonnu attēlošanai" + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Izveidot jaunu tabulu datubāzē %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of rows per page" msgid "Number of columns" @@ -2333,11 +2099,7 @@ msgid "remember template" msgstr "atcerēties šablonu" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Tabulas kodējums:" @@ -2348,7 +2110,7 @@ msgstr "Kompresija" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Nav" @@ -2390,11 +2152,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Teksta faila atrašanās vieta" @@ -2402,20 +2160,12 @@ msgstr "Teksta faila atrašanās vieta" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Direktoija, kuru norādijāt augšupielādei, nav pieejama" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "web servera augšupielādes direktorija" @@ -2544,11 +2294,7 @@ msgstr "Kārtot pēc atslēgas" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "Darbības" @@ -2620,14 +2366,14 @@ msgstr "Parādu rindas" msgid "total" msgstr "kopā" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Vaicājums ilga %01.4f s" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Labot" @@ -2695,11 +2441,7 @@ msgstr "" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Kopā" @@ -2945,11 +2687,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Formats" @@ -3021,13 +2759,8 @@ msgstr "" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Dati" @@ -3076,15 +2809,9 @@ msgstr "MIME tips" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Hosts" @@ -3284,7 +3011,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Nav tabulu" @@ -3297,7 +3024,7 @@ msgstr "SQL rezultāts" msgid "Generated by" msgstr "Uzģenerēja" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL atgrieza tukšo rezultātu (0 rindas)." @@ -3444,20 +3171,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primārā" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Indekss" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Pilni teksti" @@ -3682,6 +3409,10 @@ msgstr "Šim formātam nav opciju" msgid "not OK" msgstr "nav OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "Labi" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Ieslēgts" @@ -3704,7 +3435,7 @@ msgid "" msgstr "" "Lūdzu skatieties dokumentāciju par to, kā atjaunot 'Column_comments' tabulu" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Saglabātie SQL vaicājumi" @@ -3755,13 +3486,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Lietotājvārds" @@ -3779,22 +3505,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Mainīgais" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Vērtība" @@ -3812,40 +3530,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Jebkurš lietotājs" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Lietot teksta lauku" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Jebkurš hosts" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Lokāls" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Šis hosts" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Lietot hostu tabulu" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3869,7 +3558,6 @@ msgid "Use Host Table" msgstr "Lietot hostu tabulu" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3904,29 +3592,29 @@ msgstr "" msgid "Servers" msgstr "Serveris" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Mainīgie" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Rakstzīmju kodējumi" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Binārais log-fails" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Procesi" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3955,51 +3643,51 @@ msgstr "" msgid "Target database" msgstr "Meklēt datubāzē" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, fuzzy, php-format msgid "Run SQL query/queries on server %s" msgstr "Izpildīt SQL vaicājumu(s) uz datubāzes %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Izpildīt SQL vaicājumu(s) uz datubāzes %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Kolonnu nosaukumi" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Saglabāt šo SQL vaicājumu" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Dot ikvienam lietotājam pieeju šai grāmatzīmei" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Nepārrakstīt šo vaicājumu ārpus šī loga" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Rādīt šo vaicājumu šeit atkal " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Nosūtīt" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Tikai apskatīt" @@ -4175,13 +3863,13 @@ msgstr "" msgid "Save" msgstr "Saglabāt" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "Pievienot %s lauku(s)" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to add at least one column." @@ -4374,8 +4062,8 @@ msgstr "Atcelt" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Lietotājs" @@ -4809,118 +4497,118 @@ msgstr "" msgid "View dump (schema) of databases" msgstr "Apskatīt datubāzu dampu (shēmu)" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Iekļauj visas privilēģijas, izņemot GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Ļauj mainīt esošo tabulu struktūru." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 #, fuzzy msgid "Allows altering and dropping stored routines." msgstr "Ļauj veidot un dzēst indeksus." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Ļauj veidot jaunas datubāzes un tabulas." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 #, fuzzy msgid "Allows creating stored routines." msgstr "Ļauj veidot jaunas tabulas." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Ļauj veidot jaunas tabulas." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Ļauj veidot pagaidu tabulas." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 #, fuzzy msgid "Allows creating new views." msgstr "Ļauj veidot jaunas tabulas." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Ļauj dzēst datus." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Ļauj dzēst datubāzes un tabulas." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Ļauj dzēst tabulas." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Ļauj importēt/eksportēt datus no/uz failiem." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Ļauj pievienot lietotājus un privilēģijas bez privilēģiju tabulu " "pārlādēšanas." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Ļauj veidot un dzēst indeksus." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Ļauj ievietot un mainīt datus." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Ļauj bloķēt tabulas tekošajai darbībai." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Ierobežo jauno konekciju skaitu, ko lietotājs var atvērt stundas laikā." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Ierobežo vaicājumu skaitu, ko lietotājs var mosūtīt uz serveri stundas laikā." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4928,61 +4616,61 @@ msgstr "" "Ierobežo komandu skaitu, kas maina kas maina tabulas vai datubāzes, ko " "lietotājs var izpildīt stundas laikā." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 #, fuzzy msgid "Limits the number of simultaneous connections the user may have." msgstr "" "Ierobežo jauno konekciju skaitu, ko lietotājs var atvērt stundas laikā." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Nedarbojas šajā MySQL versijā." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "Ļauj prlādēt servera iestādījumus un iztukšot servera kešu." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" "Dod lietotājam tiesības jautāt, kur ir replikācijas oriģināli / kopijas." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Nepieciešams replikāciju kopijām." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Ļauj lasīt datus." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Dod pieeju pilnam datubāzu sarakstam." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Ļauj apstādināt serveri." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -4992,157 +4680,157 @@ msgstr "" "Nepieciešams vairumam administratīvo operāciju, kā globālo mainīgo maiņa vai " "citu lietotāju procesu nogalināšana." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "Ļauj veidot un dzēst indeksus." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Ļauj mainīt datus." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Nav privilēģiju." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Nav" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Tabulu specifiskās privilēģijas" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Piezīme: MySQL privilēģiju apzīmējumi tiek rakstīti angļu valodā " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Globālās privilēģijas" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Datubāžu specifiskās privilēģijas" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administrācija" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Resursu ierobežojumi" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Piezīme: Šo opciju uzstādīšana uz 0 (nulli) atceļ ierobežojumus." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Piekļuves informācija" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Nemainīt paroli" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Lietotāji netika atrasti." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Lietotājs %s jau eksistē!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Jūs pievienojāt jaunu lietotāju." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Jūs modificējāt privilēģijas objektam %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Jūs atņēmāt privilēgijas lietotājam %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Lietotāja %s parole tika veiksmīgi mainīta." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Dzēšam %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Pārlādējam privilēģijas" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Izvēlētie lietotāji tika veiksmīgi dzēsti." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Privilēģijas tika veiksmīgi pārlādētas." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Mainīt privilēģijas" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Atsaukt" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Lietotāju pārskats" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Piešķirt" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Jebkurš" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Pievienot jaunu lietotāju" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Dzēst izvēlētos lietotājus" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Atņemt visas aktīvās privilēģijas lietotājiem, un pēc tam dzēst tos." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Dzēst datubāzes, kurām ir tādi paši vārdi, kā lietotājiem." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5155,51 +4843,51 @@ msgstr "" "lieto serveris, ja tur tika veikti labojumi. Šajā gadījumā ir nepieciešams %" "spārlādēt privilēģijas%s pirms Jūs turpināt." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Izvēlētais lietotājs nav atrasts privilēģiju tabulā." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Kolonnu specifiskās privilēģijas" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Pievienot privilēģijas uz sekojošo datubāzi" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Aizstājējzīmes _ un % jāaizsargā ar \\ priekšā, lai izmantotu tās burtiski" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Pievienot privilēģijas uz sekojošo tabulu" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Mainīt piekļuves informāciju / Klonēt lietotāju" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Izveidot jaunu lietotāju ar tādām pašām privilēģijām un ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... paturēt veco lietotāju." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... dzēst veco lietotāju no lietotāju tabulas." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... atņemt vecajam lietotājam visas aktīvās privilēģijas, un pēc tam dzēst " "viņu." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5207,44 +4895,44 @@ msgstr "" " ... dzēst veco lietotāju no lietotāju tabulas, un pēc tam pārlādēt " "privilēģijas." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Nav" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "Pārbaudīt privilēģijas uz datubāzi "%s"." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Lietotāji, kam ir pieja datubāzei "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "globāls" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "datubāzei specifisks" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "aizstājējzīme" @@ -7867,25 +7555,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Problēmas ar indeksiem tabulā `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Nosaukums" @@ -7937,13 +7625,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Atgriezties atpakaļ iepriekšējā lapā" @@ -8026,7 +7707,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Pievienot indeksam  %s kolonn(u/as)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -8143,41 +7824,6 @@ msgstr "Pārbaudīt referenciālo integritāti:" msgid "Show tables" msgstr "Rādīt tabulas" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Diska vietas lietošana" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Aizņem" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Efektīvs" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Rindas statistika" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Parametrs" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinamisks" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Rindas garums" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Diska vietas lietošana" @@ -8211,7 +7857,6 @@ msgid "Row length" msgstr "Rindas garums" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Rindas izmērs " @@ -8284,50 +7929,50 @@ msgstr "Nav" msgid "Column %s has been dropped" msgstr "Tabula %s tika izdzēsta" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Primārā atslēga pievienota uz lauka %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Indekss tieka pievienots uz %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Relāciju pārskats" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Ieteikt tabulas sruktūru" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "Pievienot %s lauku(s)" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Tabulas beigās" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Tabulas sākumā" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Pēc %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Izveidot indeksu uz %s laukiem" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8369,6 +8014,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8726,6 +8375,10 @@ msgstr "Pārsaukt tabulu uz" #~ msgid "Process list" #~ msgstr "Procesu saraksts" +#, fuzzy +#~ msgid "Reload privileges" +#~ msgstr "Globālās privilēģijas" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/mk.po b/po/mk.po old mode 100755 new mode 100644 index dbfef7612..34745fd3a --- a/po/mk.po +++ b/po/mk.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:16+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: macedonian_cyrillic \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "прикажи ги сите" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Пребарување" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "OK" @@ -113,7 +93,7 @@ msgstr "Користи ја оваа вредност" msgid "Database %1$s has been created." msgstr "Базата на податоци %s не е прифатена" -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Коментар на базата на податоци:" @@ -140,17 +120,10 @@ msgstr "Имиња на колони" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Тип" @@ -163,7 +136,7 @@ msgstr "Тип" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -187,24 +160,18 @@ msgstr "Врски кон" msgid "Comments" msgstr "Коментари" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Не" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -213,15 +180,9 @@ msgstr "Не" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -240,142 +201,134 @@ msgstr "Прикажи содржина (шема) на базата" msgid "No tables found in database." msgstr "Табелите не се пронајдени во базата на податоци." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "избери се" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "ништо" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Името на базата на податоци не е зададено!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Базата на податоци %s е преименувана во %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Базата на податоци %s е ископирана во %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Преименувај ја базата на податоци во" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Наредба" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Копирај ја базата на податоци во" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Само структура" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Структура и податоци" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Само податоци" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREATE DATABASE пред копирање" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Додади AUTO_INCREMENT вредност" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Додади ограничувања" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Префрли се на копираната база на податоци" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Статус" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Овозможено" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "Оневозможено" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "Поправка на табелата" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Оневозможено" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "Овозможено" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Подредување" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -384,14 +337,14 @@ msgstr "" "Дополнителните можности за работа со поврзаните табели се исклучени. За да " "дознаете зошто, кликнете %sовде%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Уредување на PDF страница" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -400,11 +353,7 @@ msgstr "Табела" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Записи" @@ -412,42 +361,30 @@ msgstr "Записи" msgid "Size" msgstr "Големина" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "се користи" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Направено" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Последна измена" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Последна проверка" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -508,11 +445,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "или" @@ -546,85 +479,85 @@ msgstr "Користи табели" msgid "SQL query on database %s:" msgstr "SQL упит на базата на податоци %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Изврши SQL" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Пристапот не е допуштен" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "барем еден од зборовите" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "сите зборови" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "точен израз" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "како регуларен израз" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Резултати од пребарувањето за \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s погодоци во табелата %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Преглед" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "избриши" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "вкупно: %s погодоци" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Пребарување низ базата на податоци" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Зборови или вредности кои се бараат (џокер знак \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Барај:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Зборовите се одвојуваат со празно место (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "во табела(и):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -632,36 +565,36 @@ msgstr "во табела(и):" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Нов запис" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Структура" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Бриши" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Испразни" @@ -671,118 +604,112 @@ msgstr "Испразни" msgid "Table %s has been emptied" msgstr "Табелата %s е испразнета" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Прегледот %s е избришан" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Табелата %s е избришана" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Поглед" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 #, fuzzy msgid "Replication" msgstr "Релации" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Вкупно" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s е основно складиште на овој MySQL сервер." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Обележаното:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "обележи ги сите" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "ниедно" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "табели кои имаат пречекорувања" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Преглед за печатење" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Проверка на табелата" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Оптимизација на табелата" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Поправка на табелата" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Анализа на табелата" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Извоз" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Речник на податоци" @@ -793,10 +720,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -817,8 +744,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Акција" @@ -854,8 +781,8 @@ msgstr "Само структура" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Проверка на табелата" @@ -932,7 +859,7 @@ msgstr "Маркерот е избришан." msgid "Showing bookmark" msgstr "" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "" @@ -1011,293 +938,189 @@ msgstr "Името на host-от е празно!" msgid "The user name is empty!" msgstr "Не е внесен назив на корисник!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Лозинка е празна!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Лозинките не се идентични!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Додади нов корисник" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Верзија на серверот" - -#: js/messages.php:48 -#, fuzzy -msgid "Reloading Privileges" -msgstr "Глобални привилегии" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Избриши ги селектираните корисници" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Локален" - -#: js/messages.php:58 -#, fuzzy -msgid "Processing Request" -msgstr "Листа на процеси" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "ОК" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Преименувај ја базата на податоци во" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "База на податоци" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Копирај ја базата на податоци во" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Кодна страна" - -#: js/messages.php:69 -#, fuzzy -#| msgid "You have to choose at least one column to display" -msgid "Table must have atleast 1 column" -msgstr "Морате да изберете барем една колона за приказ" - -#: js/messages.php:70 -#, fuzzy -msgid "Create Table" -msgstr "Направи нова страница" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Пребарување" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Измените се сочувани" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 #, fuzzy msgid "Relation deleted" msgstr "Релационен поглед" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 #, fuzzy msgid "Internal relation added" msgstr "Внатрешни релации" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Општи особини на релациите" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Оневозможено" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Избери полиња за прикажување" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "нема" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Претходна" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Следен" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Вкупно" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Бинарен" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "мар" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "апр" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "мај" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "јун" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "јул" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "авг" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "окт" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "јан" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "феб" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "мар" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "апр" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1305,176 +1128,176 @@ msgid "May" msgstr "мај" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "јун" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "јул" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "авг" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "сеп" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "окт" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "нов" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "дек" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Нед" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Пон" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Вто" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Пет" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Нед" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Пон" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Вто" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Сре" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Чет" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Пет" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Саб" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Нед" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Пон" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Вто" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Сре" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Чет" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Пет" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Саб" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "се користи" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1534,7 +1357,7 @@ msgstr "Клучеви" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Единствен" @@ -1553,7 +1376,7 @@ msgid "Comment" msgstr "Коментари" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1576,8 +1399,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "База на податоци" @@ -1745,11 +1568,7 @@ msgstr "Лозинка:" msgid "Server Choice" msgstr "Избор на сервер" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "вашиот веб прелистувач треба да допушти cookies" @@ -1831,11 +1650,7 @@ msgstr "" "Не можам да ги користам iconv или libiconv или recode_string функциите иако " "екстензијата пријавува дека е вчитана. Проверите ја вашата PHP конфигурација." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Ако добиете празна страница, се е во ред." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1872,47 +1679,27 @@ msgstr "" "$cfg['PmaAbsoluteUri'] директивата МОРА да биде подесена во " "конфигурациската податотека!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Сервер" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "" @@ -1941,7 +1728,7 @@ msgstr "Пратено" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Документација" @@ -1955,138 +1742,138 @@ msgstr "SQL упит" msgid "MySQL said: " msgstr "MySQL порака: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Објасни SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Прескокни ги објаснувањата на SQL-от" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "без PHP код" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Направи PHP код" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Освежи" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Прескокни ја проверката на SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Провери SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Складишта" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Време" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "бајти" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d. %B %Y. во %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s денови, %s часови, %s минути и %s секунди" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Почеток" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Претходна" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Крај" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Премин на базата "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2107,7 +1894,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Име" @@ -2135,16 +1922,16 @@ msgstr "Упит по пример" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 #, fuzzy msgid "Import" msgstr "Извоз" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Привилегии" @@ -2165,11 +1952,7 @@ msgstr "" "3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Пречекорување" @@ -2186,7 +1969,7 @@ msgstr "Серверот не одговара" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(или приклучокот со локалниот MySQL сервер не е исправно подесен)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2196,36 +1979,22 @@ msgid "Change password" msgstr "Промена на лозинка" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Нема лозинка" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Лозинка" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Повтори внес" @@ -2240,20 +2009,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 компатибилно" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Генерирање на лозинка" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Генерирај" @@ -2266,17 +2027,23 @@ msgstr "Креирај нова база на податоци" msgid "Create" msgstr "Креирај" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Нема привилегии" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "You have to choose at least one column to display" +msgid "Table must have at least one column." +msgstr "Морате да изберете барем една колона за приказ" + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Креирај нова табела во базата на податоци %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of rows per page" msgid "Number of columns" @@ -2339,11 +2106,7 @@ msgid "remember template" msgstr "запамти го шаблонот" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Кодна страна на податотеката:" @@ -2354,7 +2117,7 @@ msgstr "Компресија" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "нема" @@ -2396,11 +2159,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Локација на текстуалната податотека" @@ -2408,20 +2167,12 @@ msgstr "Локација на текстуалната податотека" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Директориумот кој го избравте за праќање не е достапен" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "директориум за праќање на веб серверот " @@ -2550,11 +2301,7 @@ msgstr "Подредување по клуч" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "Операции" @@ -2626,14 +2373,14 @@ msgstr "Приказ на записи од " msgid "total" msgstr "вкупно" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "време на извршување на упитот %01.4f секунди" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Промени" @@ -2705,11 +2452,7 @@ msgstr "Искористеност на баферот" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Вкупно" @@ -2971,11 +2714,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Формат" @@ -3047,13 +2786,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Податоци" @@ -3102,15 +2836,9 @@ msgstr "MIME-типови" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Host" @@ -3309,7 +3037,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Нема табела" @@ -3322,7 +3050,7 @@ msgstr "SQL резултат" msgid "Generated by" msgstr "Генерирал" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL врати празен резултат (нула записи)." @@ -3469,20 +3197,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Примарен" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Клуч" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Текст клуч" @@ -3707,6 +3435,10 @@ msgstr "Не постојат опции за овој формат" msgid "not OK" msgstr "не е како што треба" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "ОК" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Овозможено" @@ -3730,7 +3462,7 @@ msgstr "" "Ве молиме погледнете во документацијата за тоа како се ажурира табелата " "Column_comments" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Запамтен SQL упит" @@ -3781,13 +3513,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Назив на корисник" @@ -3805,22 +3532,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Променлива" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Вредност" @@ -3838,40 +3557,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Било кој корисник" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Користи текст поле" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Било кој host" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Локален" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Овој host" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Користи ја табелата на host-от" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3895,7 +3585,6 @@ msgid "Use Host Table" msgstr "Користи ја табелата на host-от" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3930,30 +3619,30 @@ msgstr "" msgid "Servers" msgstr "Сервер" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Променливи" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Кодни страници" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Складишта" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Бинарен дневник" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 #, fuzzy msgid "Processes" msgstr "Листа на процеси" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3982,51 +3671,51 @@ msgstr "" msgid "Target database" msgstr "Пребарување низ базата на податоци" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, fuzzy, php-format msgid "Run SQL query/queries on server %s" msgstr "Изврши SQL упит(и) на базата %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Изврши SQL упит(и) на базата %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Имиња на колони" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Запамти SQL упит" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "дади дозвола на секој корисник да пристапува на овој упит." -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Не го препишувај овој упит надвор од овој прозорец" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr "Прикажи го повторно овој упит" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Испрати" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Види само" @@ -4202,13 +3891,13 @@ msgstr "" msgid "Save" msgstr "Сочувај" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "Додади %s полиња" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to add at least one column." @@ -4417,8 +4106,8 @@ msgstr "Поништи" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Корисник" @@ -4858,117 +4547,117 @@ msgstr "Видови на складишта" msgid "View dump (schema) of databases" msgstr "Прикажи содржина (шема) на базите" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Ги вклучува сите привилегии освен GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Дозволува промена на структурата на постоечките табели." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Дозволува промена и бришење на stored рутини." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Дозволува креирање на нови бази на податоци и табели." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Дозволува креирање на stored рутини." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Дозволува креирање на нови табела." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Дозволува креирање на привремени табели..." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Дозволува креирање, бришење и преименување на корсиничките имиња." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Дозволува креирање на нови погледи." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Дозволува бришење на податоци." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Дозволува бришење на бази на податоци и табели." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Дозволува бришење на табели." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Дозволува извршување на stored рутини." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Дозволува увоз на податоци и нивен извоз во податотеки." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Дозволува додавање на корисници и привилегии без повтроно вчитавање на " "табелата на привилегии." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Дозволува креирање и бришење на клучева." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Дозволува вметнување и замена на података." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Дозволува заклучување на табели на тековните процеси." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Го ограничува бројот на нови конекции кои корисникот може да ги отвори за " "еден час." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Го ограничува бројот на упити кои корисникот може да ги постави на серверот " "за еден час." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4976,63 +4665,63 @@ msgstr "" "Го ограничува бројот на команди кои ги менуваат табелите или базите на " "податоци кои корисникот може да ги изврши за еден час." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 #, fuzzy msgid "Limits the number of simultaneous connections the user may have." msgstr "" "Го ограничува бројот на нови конекции кои корисникот може да ги отвори за " "еден час." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Нема ефект во оваа верзији на MySQL." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Дозволува повтоно вчитување на подесувањата на серверот и празнење на кешот " "на серверот." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Дава права на кориснику да праша каде се главните/помошни сервери." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Потребно заради помошните сервери за репликација." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Дозволува читање на податоци." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Дава пристап на комплетната листа на базите на податоци." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Дозволува извршување на SHOW CREATE VIEW упити." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Дозволува гасење на серверот." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5042,161 +4731,161 @@ msgstr "" "Неопходно за повеќето административни опции како што е подесување на " "глобални променливи или прекин на процеси наостанатите корисници." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "Дозволува креирање и бришење на клучева." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Дозволува измена на податоци." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Нема привилегии." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "нема" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Привилегии поврзани со табелата" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr "" " Напомена: MySQL имињата на привилегите мора да бидат со латинични букви " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Глобални привилегии" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Привилегии во врска со базата на податоци" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Администрација" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Ограничување на ресурси" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" "Напомена: Поставувањето на овие опции на 0 (нула) ги отстранува " "ограничувањата." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Податоци за најавувањето" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Немој да ја менуваш лозинката" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Корисникот не е пронајден." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Корисник %s веќе постои!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Додадовте нов корисник." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Ги ажуриравте привилегиите за %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Ги забранивте привилегиите за %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Лозинката за %s успешно е променета." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Бришам %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Повторно ги вчитувам привилегиите" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Изабраните корисници успешно се избришани." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Привилегиите се успешно вчитани." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Промена на привилегии" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Забрани" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Преглед на корисници" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Овозможи" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Било кој" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Додади нов корисник" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Избриши ги селектираните корисници" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Одземи ги сите привилегии на активните корисници а потоа избриши ги." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "" "Избриши ги базите на податоци кои се именувани исто како и корисниците." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5210,49 +4899,49 @@ msgstr "" "измени. Во тој случај %sповторно вчитајте ги привилегиите%s пред да " "продолжите со работа." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Изабраниот корисник не е пронајден во табелата на привилегии." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Привилегии врзани за колоните" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Додади привилегии на следната база" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Пред џокер знаците _ и % треба да стои знакот \\ ако ги користите самостојно" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Додади привилегии на следната табела" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Промени ги информациите за најавувањето / Копирај го корисникот" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Направи нов корисник со исти привилегии и ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... сочувај го стариот." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... избриши ги старите од табелата на корисници." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... прво одземи ги сите привилегии на корисниците а потоа избриши ги." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5260,44 +4949,44 @@ msgstr "" " ... избриши го стариот корисник од табелата на корисници а потоа повторно " "вчитај ги привилегиите." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "нема" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "Провери привилегии за базата на податоци "%s"." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Корисници кои имаат пристап "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "глобално" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "Специфично за базата на податоци" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "џокер" @@ -7921,25 +7610,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Проблем при индексирање на табелата `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Назив" @@ -7993,13 +7682,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Назад на претходната страница" @@ -8080,7 +7762,7 @@ msgstr "(\"PRIMARY\" може да биде име само на msgid "Add to index  %s column(s)" msgstr "Додади во клучот  %s колона(и)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -8197,41 +7879,6 @@ msgstr "Провери го референцијалниот интегрите msgid "Show tables" msgstr "Прикажи табели" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Големина" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Големина" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Ефективни" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Статистики за записите" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Име" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "динамички" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Должина на запис" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Големина" @@ -8265,7 +7912,6 @@ msgid "Row length" msgstr "Должина на запис" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "Големина на запис" @@ -8338,50 +7984,50 @@ msgstr "нема" msgid "Column %s has been dropped" msgstr "Табелата %s е избришана" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Примарниот клуч %s е додаден" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Клучот е додаден %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Релационен поглед" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Предложи структура на табелата" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "Додади %s полиња" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "на крајот од табелата" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "на почетокот од табелата" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "после полето %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Направи клуч на %s колони" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8423,6 +8069,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8789,6 +8439,10 @@ msgstr "Промени го името на табелата во " #~ msgid "Process list" #~ msgstr "Листа на процеси" +#, fuzzy +#~ msgid "Reload privileges" +#~ msgstr "Глобални привилегии" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/mn.po b/po/mn.po old mode 100755 new mode 100644 index 25b95481e..8283b8467 --- a/po/mn.po +++ b/po/mn.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: mongolian \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Бүгдийг харах" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -40,53 +36,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Хайх" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Яв" @@ -112,7 +92,7 @@ msgstr "Уг утгыг хэрэглэх" msgid "Database %1$s has been created." msgstr "" -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "ӨС-ийн тайлбар: " @@ -139,17 +119,10 @@ msgstr "Баганын нэрс" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Төрөл" @@ -162,7 +135,7 @@ msgstr "Төрөл" msgid "Null" msgstr "Хоосон" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -186,24 +159,18 @@ msgstr "Холбоос" msgid "Comments" msgstr "Тайлбар" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Үгүй" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -212,15 +179,9 @@ msgstr "Үгүй" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -239,141 +200,133 @@ msgstr "ӨС-ийн схем харах" msgid "No tables found in database." msgstr "ӨС-д хүснэгт олдсонгүй." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Бүгдийг сонгох" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Бүх сонгосныг болих" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Өгөгдлийн сангийн нэр хоосон!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "ӨС %s-н нэр нь %s-ээр солигджээ" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "ӨС %s нь %s руу хуулагдлаа" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Өгөгдлийн санг д.нэрлэх нь" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Команд" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "ба тэгээд" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Өгөгдлийн сан хуулах нь" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Зөвхөн бүтэц" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Бүтэц ба өгөгдөл" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Зөвхөн өгөгдөл" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "хуулахын өмнө CREATE DATABASE" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Нэмэх %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "AUTO_INCREMENT утга нэмэх" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Тогтмол нэмэх" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Хуулагдсан ӨС руу шилжих" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Статус" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Нээлттэй" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair table" msgctxt "BLOB repository" msgid "Repair" msgstr "Хүснэгт засах" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Хаагдсан" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Жишилт" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -382,14 +335,14 @@ msgstr "" "Холбогдсон хүснэгтүүдтэй ажиллах нэмэлт онцлогууд идэвхгүй болжээ. %sЭнд%s " "дарж шалгах." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "PDF-хуудаснуудыг засах" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -398,11 +351,7 @@ msgstr "Хүснэгт " #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Мөрүүд" @@ -410,42 +359,30 @@ msgstr "Мөрүүд" msgid "Size" msgstr "Хэмжээ" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "хэрэглэгдэж байна" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Үүсгэлт" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Сүүлийн шинэчлэл" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Сүүлийн шалгалт" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -506,11 +443,7 @@ msgstr "Устгах" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Эсвэл" @@ -544,85 +477,85 @@ msgstr "Хүснэгт хэрэглэх" msgid "SQL query on database %s:" msgstr "ӨС %s дахь SQL-асуулт:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Асуултыг илгээх" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Хандах эрхгүй" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "Үгүүдийн ядаж нэгээр" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "бүх үг" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "яг цав өгүүлбэр" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "as regular expression" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Хайлтын үр дүн \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s олдоц(ууд) хүснэгт %s-д" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Хөтлөх" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Устгах" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Нийт: %s олдоц(ууд)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Өгөгдлийн санд хайх" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Үг(үүд) ба утга(ууд) -ыг хайх (түлхүүр \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Хайх:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Їгнїїд хоосон зайгаар (\" \") хуваагдана." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Хүснэгт(үүд) дотор:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -630,36 +563,36 @@ msgstr "Хүснэгт(үүд) дотор:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Оруулах" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Бүтэц" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Устгах" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Хоосон" @@ -669,117 +602,111 @@ msgstr "Хоосон" msgid "Table %s has been emptied" msgstr "Хүснэгт %s нь хоослогдлоо" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Харц %s нь устгагдсан" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Хүснэгт %s нь устгагдлаа" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Харц" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Олшруулалт" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Нийт" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s нь уг MySQL сервэрийн анхдагч агуулах хөдөлгүүр байна." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Сонгогдсонтой:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Бүгдийг чагтлах" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Бүх чагтыг болих" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Дээдхийг шалгах" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Хэвлэхээр харах" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Хүснэгт шалгах" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Хүснэгтийг зүгшрүүлэх" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Хүснэгт засах" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Хүснэгтийг задлах" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Гаргах" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Өгөгдлийн толь" @@ -790,10 +717,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -813,8 +740,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Үйлдэл" @@ -848,8 +775,8 @@ msgstr "" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "" @@ -923,7 +850,7 @@ msgstr "Тэмдэглэгээ устгагдсан." msgid "Showing bookmark" msgstr "Тэмдэглэл харуулах" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Тэмдэглэл %s нь үүсгэгдлээ" @@ -1002,296 +929,187 @@ msgstr "Хостын нэр хоосон!" msgid "The user name is empty!" msgstr "Хэрэглэгчийн нэр хоосон!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Нууц үг хоосон байна!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Нууц їгнїїд ялгаатай байна!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Шинэ хэрэглэгч нэмэх" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create" -msgid "Create User" -msgstr "Үүсгэх" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Онцгой эрхүүдийг дахин дуудах" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Сонгогдсон хэрэглэгчдийг хасах" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Болих" -#: js/messages.php:57 -#, fuzzy -#| msgid "Log in" -msgid "Loading" -msgstr "Нэвтрэх" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Процессууд" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "Бэлэн" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Өгөгдлийн санг д.нэрлэх нь" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "ӨС" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Өгөгдлийн сан хуулах нь" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Кодлол" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Хүснэгт нь багадаа нэг талбартай байх хэрэгтэй." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Хүснэгт үүсгэх" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Хайх" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Өөрчлөлт хадгалагдав" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Холбоо устав" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Дотоод холбоо нэмэгдэв" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Ерөнхий хамаатай онцлог" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Хаагдсан" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Хамаарагдсан түлхүүр сонгох" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Гадаад түлхүүр сонгох" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Үндсэн түлхүүр эсвэл орь ганц түлхүүр сонгон уу" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Харуулах талбарыг соль" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "Байхгүй" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Өмнөх" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Цааш" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Нийт" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr " Хоёртын " -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "3-р" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "4-р" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "5-р" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "6-р" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "7-р" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "8-р" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "10р" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "1-р" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "2-р" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "3-р" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "4-р" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1299,176 +1117,176 @@ msgid "May" msgstr "5-р" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "6-р" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "7-р" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "8-р" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "9-р" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "10р" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "11р" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "12р" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Ня" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Да" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Мя" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Ба" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Ня" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Да" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Мя" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Лх" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Пү" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Ба" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Бя" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Ня" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Да" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Мя" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Лх" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Пү" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Ба" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Бя" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "хэрэглэгдэж байна" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1525,7 +1343,7 @@ msgstr "Индексүүд" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Үл давтагдах" @@ -1543,7 +1361,7 @@ msgid "Comment" msgstr "" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1566,8 +1384,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Өгөгдлийн сангууд" @@ -1735,11 +1553,7 @@ msgstr "Нууц үг:" msgid "Server Choice" msgstr "Сервэр сонго" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Энэ газарт Cookies нээлттэй байх ёстой." @@ -1819,11 +1633,7 @@ msgstr "" "iconv, libiconv, recode_string өргөтгөлүүдийн алийг ч хэрэглэж чадсангүй " "(extension reports-д дуудагдах). Php тохиргоогоо шалга." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Анхдагч тохиргоо дуудагдсангүй нь: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" msgstr "" "$cfg['PmaAbsoluteUri'] -ыг тохиргооны файлд тохируулах хэрэгтэй!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Сервэрийн буруу индекс нь: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "%1$s сервэрийн хост буруу. Өөрийн тохиргоогоо нягтална уу." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Сервэр" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Тохиргоонд сонгогдсон буруу зөвшөөрлийн арга:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Тохиргоонд сонгогдсон буруу зөвшөөрлийн арга:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Та хувилбар %s -г %s -ээр сайжруулах хэрэгтэй эсвэл дараа." @@ -1926,7 +1708,7 @@ msgstr "" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Баримт" @@ -1940,138 +1722,138 @@ msgstr "SQL-асуулт" msgid "MySQL said: " msgstr "MySQL хэлэх нь: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "SQL тайлбар" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "SQL тайлбарлахыг орхих" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "PHP-кодгүй" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "PHP-код үүсгэх" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Да.дуудах" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "SQL шалгалтыг алгасах" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "SQL-ийг батлах" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Хөдөлгүүрүүд" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Цаг" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Байт" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "кБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "МБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "ГБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%Y оны %B сарын %d., %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s өдөр, %s цаг, %s минут, %s секунд" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Эхлэл" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Өмнөх" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Төгс" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr ""%s" өгөгдлийн сан руу үсрэх." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2090,7 +1872,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Нэр" @@ -2118,15 +1900,15 @@ msgstr "Асуулт (Query)" msgid "Designer" msgstr "Дизайнч" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Оруулах" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Онцгой эрхүүд" @@ -2145,11 +1927,7 @@ msgid "" msgstr "May be approximate. See FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Толгой дээр" @@ -2166,7 +1944,7 @@ msgstr "Сервэрээс хариу алга" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(эсвэл дотоод MySQL сервэрийн socket нь зөв тохируулагдаагүй)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2176,36 +1954,22 @@ msgid "Change password" msgstr "Нууц үг солих" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Нууц үггүй" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Нууц үг" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Дахин бич" @@ -2220,20 +1984,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 compatible" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Нууц үг бий болгох" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Бий болгох" @@ -2246,17 +2002,23 @@ msgstr "Шинэ ӨС үүсгэх" msgid "Create" msgstr "Үүсгэх" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Онцгой эрхгүй" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Хүснэгт нь багадаа нэг талбартай байх хэрэгтэй." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "%s ӨС-д шинэ хүснэгт үүсгэх" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2321,11 +2083,7 @@ msgid "remember template" msgstr "загварыг санах" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Файлын кодлол:" @@ -2336,7 +2094,7 @@ msgstr "Шахалт" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Байхгүй" @@ -2378,11 +2136,7 @@ msgstr "" msgid "File to import" msgstr "Оруулах файл" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Бичвэрфайлын байрлал" @@ -2390,20 +2144,12 @@ msgstr "Бичвэрфайлын байрлал" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Таны сонгосон хавтас \"upload\" хийгдэхгүй байна" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "web-сервэр түлхэх хавтас" @@ -2535,11 +2281,7 @@ msgstr "Түлхүүрээр эрэмбэлэх" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Сонголтууд" @@ -2609,14 +2351,14 @@ msgstr "Мөрүүдийг харуулж байна " msgid "total" msgstr "Нийт" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Асуулт нь %01.4f сек авлаа" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Солих" @@ -2686,11 +2428,7 @@ msgstr "Буффер Pool Хэрэглээ" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Нийт" @@ -2948,11 +2686,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Тогтнол" @@ -3024,13 +2758,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Өгөгдөл" @@ -3079,15 +2808,9 @@ msgstr "MIME-төрөл" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Хост" @@ -3282,7 +3005,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "Шинэ phpMyAdmin цонх нээх" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "" @@ -3294,7 +3017,7 @@ msgstr "SQL-үр дүн" msgid "Generated by" msgstr "Үүсгэгч" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL хоосон үр дүн буцаалаа (тэг мөрүүд г.м.)." @@ -3440,20 +3163,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Үндсэн" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Индекс" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Бүтэнбичвэр" @@ -3678,6 +3401,10 @@ msgstr "Энэ тогтнол сонголтгүй" msgid "not OK" msgstr "Бэлэн биш" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "Бэлэн" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Нээлттэй" @@ -3700,7 +3427,7 @@ msgid "" msgstr "" "Column_comments Хүснэгтийн хэрхэн шинэчлэх талаар баримтжууллаас харна уу" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Тэмдэглэгдсэн SQL-асуулт" @@ -3751,13 +3478,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Хэрэглэгчийн нэр" @@ -3774,22 +3496,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Хувьсагч" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Утга" @@ -3807,40 +3521,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Дурын хэрэглэгч" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Бичвэр талбар хэрэглэх" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Дурын хост" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Local" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Энэ хост" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Хост хүснэгт хэрэглэх" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3864,7 +3549,6 @@ msgid "Use Host Table" msgstr "Хост хүснэгт хэрэглэх" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3898,29 +3582,29 @@ msgstr "Үл мэдэгдэх хэл: %1$s." msgid "Servers" msgstr "Сервэрүүд" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Утгууд" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Кодлолууд" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Хөдөлгүүрүүд" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Хоёртын log" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Процессууд" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3947,51 +3631,51 @@ msgstr "" msgid "Target database" msgstr "" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "%s сервэр дээр SQL асуудал/асуудлууд ажиллуулах" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Өгөгдлийн сан %s дээрх SQL асуултыг ажиллуулах" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Баганын нэрс" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Энэ SQL-асуулт-ыг тэмдэглэх" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Энэ тэмдэглэгээг бүх хэрэглэгчид хандахыг зөвшөөрөх" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Өмнөх адил нэртэй тэмдэглэлийг солих" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Цонхны гаднаас энэ асуултыг давхарлахгүй байх" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Зааглагч" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Уг асуултыг энд дахин харуулах " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Илгээ" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Зөвхөн харах" @@ -4166,13 +3850,13 @@ msgstr "" msgid "Save" msgstr "Хадгалах" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "%s талбар(ууд) нэмэх" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4365,8 +4049,8 @@ msgstr "Да.эхлэх" msgid "Protocol version" msgstr "Протоколын хувилбар" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Хэрэглэгч" @@ -4800,113 +4484,113 @@ msgstr "Агуулах хөдөлгүүрүүд" msgid "View dump (schema) of databases" msgstr "ӨС-ийн схем харах" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Includes all privileges except GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Байгаа хүснэгтийн бүтцийг өөрчлөхийг зөвшөөрөх." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Хадгалагдсан заншил устгах, өөрчлөхийг зөвшөөрөх." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Шинэ өгөгдлийн сан, хүснэгт үүсгэхийг зөвшөөрөх." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Хадгалагдсан заншил үүсгэхийг зөвшөөрөх." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Шинэ хүснэгт үүсгэхийг зөвшөөрөх." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Завсрын хүснэгт үүсгэхийг зөвшөөрөх." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Хэрэглэгчийн эрхийг үүсгэх, устгах, да.нэрлэхийг зөвшөөрөх." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Шинэ харц үүсгэхийг зөвшөөрөх." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Өгөгдөл устгахыг зөвшөөрөх." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "ӨС, хүснэгт устгахыг зөвшөөрөх " -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Хүснэгт устгахыг зөвшөөрөх." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Хадгалагдсан заншлыг ажиллуулахыг зөвшөөрөх." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Өгөгдөл оруулах, файл руу гаргахыг зөвшөөрөх." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Хэрэглэгч болон онцгой эрхийг онцгой эрхийн хүснэгтийг дуудалгүй нэмэхийг " "зөвшөөрөх." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Индекс үүсгэх, устгахыг зөвшөөрөх." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Өгөгдөл нэмэх, солихыг зөвшөөрөх." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Тухайн процесст хүснэгт түгжихийг зөвшөөрөх." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Цаг тутамд шинээр холбогдох хэрэглэгчийн тоог хязгаарлах." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Цаг тутамд хэрэглэгчийн асуулт (query) илгээхийг хязгаарлах." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4914,58 +4598,58 @@ msgstr "" "Цаг тутамд хэрэглэгчийн хүснэгт эсвэл өгөгдлийн сан солих командыг " "хязгаарлах." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Хэрэглэгчдэд байх зэрэг холболтын хязгаарлах тоо." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "MySQL-ын энэ хувилбарт үйлчлэлгүй." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "Сервэрийн тохиргоог дахин дуудахыг зөвшөөрөх." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Gives the right to the user to ask where the slaves / masters are." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Needed for the replication slaves." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Өгөгдөл уншихыг зөвшөөрөх." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Өгөгдлийн сангийн бүрэн жагсаалт руу хандахыг өгөх." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "SHOW CREATE VIEW асуултыг хийхийг зөвшөөрөх." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Сервэрийг унтраахыг зөвшөөрөх." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -4974,158 +4658,158 @@ msgstr "" "Хэрэв ХИ холболтын тоо гүйцсэн ч холбогдохыг зөвшөөрөх. Бусад хэрэглэгчийн " "процессыг үгүй хийх эсвэл глобал утгыг өөрчлөх шаардлагатай болно." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Өгөгдөл солихыг зөвшөөрөх." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Онцгой эрхгүй." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Байхгүй" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr " Хүснэгтийн тусгай онцгой эрхүүд" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Тэмдэглэл: MySQL онцгой эрхийн нэр нь англиар илэрхийлэгдсэн " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Глобал онцгой эрх" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr " Онцгой эрх, өгөгдлийн сангийн эрх" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Зохион байгуулалт" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Нөөцийн хязгаар" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Тэмдэглэл: Тохируулгын сонголтыг 0 (тэг) болговол хязгаарыг хасна." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Нэвтрэх мэдээлэл" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Нууц үгийг солихгүй" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Хэрэглэгч олдсонгүй." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Хэрэглэгч %s оршин байна!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Шинэ хэрэглэгч нэмэгдлээ." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, fuzzy, php-format msgid "You have updated the privileges for %s." msgstr "Онцгой эрх шинэчлэгдлээ" -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Онцгой эрх %s -ыг хүчингүй болголоо" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "%s-ы нууц үг солигдлоо." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "%s-г устгаж байна" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Устгахаар хэрэглэгч сонгогдсонгүй!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Онцгой эрхийг дахин дуудаж байна" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Сонгогдсон хэрэглэгч устгагдлаа." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Онцгой эрхүүд дахин дуудагдлаа." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Онцгой эрхүүдийг засах" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Хүчингүй" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "User overview" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Хандив" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Дурын" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Шинэ хэрэглэгч нэмэх" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Сонгогдсон хэрэглэгчдийг хасах" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Устгахын төгсгөлд нь хэрэглэгчдээс идэвхтэй бүх онцгой эрхийг хүчингүй " "болгох." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Хэрэглэгчтэй адил нэртэй өгөгдлийн санг устгах." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5138,48 +4822,48 @@ msgstr "" "агуулга нь сервэрт хэрэглэгдэж буйгаас өөр байна. Энэ тохиолдолд %sдахин " "дуудаж%s үргэлжлүүлнэ үү." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Сонгогдсон хэрэглэгч онцгой эрхийн хүснэгтэд алга байна." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Онцгой эрх, баганын эрх" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Дараах өгөгдлийн санд онцгой эрх нэмэх" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Дараах хүснэгтэд онцгой эрх нэмэх" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Нэвтрэх мэдээллийг солих/ Хэрэглэгч хуулах" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Адил онцгой эрхтэй хэрэглэгч үүсгэх ба ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... хуучныг үлдээх." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... хэрэглэгчийн хүснэгтүүдээс устгах." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... хуучнаас бүх онцгой эрхийг хүчингүй болгоод дараа нь устга." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5187,44 +4871,44 @@ msgstr "" " ... хэрэглэгчийн хүснэгтүүдээс нэгийг устгаад дараа нь онцгой эрхийг дахин " "дууд." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Хэрэглэгчийн өгөгдлийн сан" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Байхгүй" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Хэрэглэгчдийн хандсан нь "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "global" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "Өгөгдлийн сангийн эрх" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "загвар" @@ -7855,25 +7539,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "PHP кодоор харуулах" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "SQL асуудал харуулах" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Хүснэгт `%s`-ийн индекс асуудалтай" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Хаяг" @@ -7925,13 +7609,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "ба тэгээд" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Буцах" @@ -8013,7 +7690,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Индекст нэмэх %s багана(ууд)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Баганы тоо тэгээс их байна." @@ -8127,41 +7804,6 @@ msgstr "Үнэн зөв өгөгдлийг шалгах:" msgid "Show tables" msgstr "Хүснэгтүүдийг харуулах" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Ашиглалтын зай" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Ашиглалт" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Эффекттэй" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Мөрийн статистик" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Баримтжуулал" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "динамик" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Мөрийн урт" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Ашиглалтын зай" @@ -8195,7 +7837,6 @@ msgid "Row length" msgstr "Мөрийн урт" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Мөрийн хэмжээ " @@ -8267,50 +7908,50 @@ msgstr "Байхгүй" msgid "Column %s has been dropped" msgstr "Хүснэгт %s нь устгагдлаа" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "%s-д үндсэн түлхүүр нэмэгдлээ" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "%s-д индекс нэмэгдсэн байна" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Хамаарал харах" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Хүснэгтийн бүтцийг таниулах" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "%s талбар(ууд) нэмэх" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Хүснэгтийн төгсгөлд" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Хүснэгтийн эхэнд" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "%s-ы дараа" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr " %s багануудад индекс үүсгэх" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8352,6 +7993,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8686,6 +8331,9 @@ msgstr "" #~ msgid "Process list" #~ msgstr "Процессын жагсаалт" +#~ msgid "Reload privileges" +#~ msgstr "Онцгой эрхүүдийг дахин дуудах" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/ms.po b/po/ms.po old mode 100755 new mode 100644 index d2186aab2..7d6ea39ff --- a/po/ms.po +++ b/po/ms.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: malay \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Papar semua" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -38,53 +34,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Cari" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Pergi" @@ -111,7 +91,7 @@ msgstr "" msgid "Database %1$s has been created." msgstr "angkalan data %s telah digugurkan." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 #, fuzzy msgid "Database comment: " msgstr "Komen jadual" @@ -139,17 +119,10 @@ msgstr "Nama Kolum" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Jenis" @@ -162,7 +135,7 @@ msgstr "Jenis" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -186,24 +159,18 @@ msgstr "Pautan ke" msgid "Comments" msgstr "Komen" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Tidak" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -212,15 +179,9 @@ msgstr "Tidak" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -239,145 +200,137 @@ msgstr "Lihat longgokan (skema) pangkalan data" msgid "No tables found in database." msgstr "Tiada jadual dijumpai pada pangkalan data." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Sila pilih pangkalan data" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Nyahpilih Semua" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 #, fuzzy msgid "The database name is empty!" msgstr "Nama jadual adalah kosong" -#: db_operations.php:241 +#: db_operations.php:236 #, fuzzy, php-format msgid "Database %s has been renamed to %s" msgstr "Jadual %s telah ditukarnama ke %s" -#: db_operations.php:245 +#: db_operations.php:240 #, fuzzy, php-format msgid "Database %s has been copied to %s" msgstr "Jadual %s telah disalin ke %s." -#: db_operations.php:423 +#: db_operations.php:412 #, fuzzy msgid "Rename database to" msgstr "Tukarnama jadual ke" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Arahan" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "" #: db_operations.php:455 ->>>>>>> origin/master #, fuzzy msgid "Copy database to" msgstr "Tiada pangkalan data" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Struktur sahaja" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Struktur dan data" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Data sahaja" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Status" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Membenarkan" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "Tidak Membenarkan" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "Baiki jadual" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Tidak Membenarkan" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "Membenarkan" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -386,14 +339,14 @@ msgstr "" "Ciri-ciri tambahan ini adalah untuk bekerja dengan pautan jadual yang telah " "tidak diaktifkan. Untuk mengetahuinya klik %shere%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Ubah Halaman PDF" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -402,11 +355,7 @@ msgstr "Jadual" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Baris" @@ -414,43 +363,31 @@ msgstr "Baris" msgid "Size" msgstr "Saiz" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "sedang digunakan" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master #, fuzzy msgid "Creation" msgstr "Cipta" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -511,11 +448,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Atau" @@ -549,85 +482,85 @@ msgstr "Guna Jadual" msgid "SQL query on database %s:" msgstr "SQL- kueri pada pangkalan data %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Hantar Kueri" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Akses dinafikan" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "sekurang-kurangnya satu perkataan" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "semua perkataan" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "Frasa tepat" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "sebagai penyataan regular (regexp)" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Hasil carian bagi \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s padanan di dalam jadual %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Lungsur" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Padam" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Jumlah: %s padanan" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Cari di pangkalan data" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Perkataan atau nilai untuk dicari (wildcard: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Cari:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Perkataan dipisahkan oleh aksara ruang (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Di dalam jadual:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -635,36 +568,36 @@ msgstr "Di dalam jadual:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Selit" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Struktur" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Gugur" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Kosong" @@ -674,117 +607,111 @@ msgstr "Kosong" msgid "Table %s has been emptied" msgstr "Jadual %s telah dikosongkan" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, fuzzy, php-format msgid "View %s has been dropped" msgstr "Medan %s telah digugurkan" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Jadual %s telah digugurkan" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Jumlah" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "" -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Dengan pilihan:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Tanda Semua" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Nyahtanda Semua" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Paparan Cetak" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Periksa Jadual" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimakan jadual" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Baiki jadual" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analyze table" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Eksport" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Kamus Data" @@ -795,10 +722,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -819,8 +746,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Aksi" @@ -856,8 +783,8 @@ msgstr "Struktur sahaja" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Periksa Jadual" @@ -932,7 +859,7 @@ msgstr "TandaBuku telah dipadam." msgid "Showing bookmark" msgstr "" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "" @@ -1013,288 +940,189 @@ msgstr "Nama hos adalah kosong!" msgid "The user name is empty!" msgstr "Kata Pengenalan kosong!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Katalaluan adalah kosong!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Katalaluan tidak sama!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Tambah Pengguna Baru" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Versi Pelayan" - -#: js/messages.php:48 -#, fuzzy -msgid "Reloading Privileges" -msgstr "Tiada Privilej" - -#: js/messages.php:49 -msgid "Removing Selected Users" -msgstr "" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Local" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Proses-proses" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -msgid "Renaming Databases" -msgstr "Tukarnama jadual ke" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Pangkalan Data" - -#: js/messages.php:67 -#, fuzzy -msgid "Copying Database" -msgstr "Tiada pangkalan data" - -#: js/messages.php:68 -msgid "Changing Charset" -msgstr "" - -#: js/messages.php:69 -#, fuzzy -#| msgid "You have to choose at least one column to display" -msgid "Table must have atleast 1 column" -msgstr "Anda mesti pilih sekurang-kurangnya satu Kolum untuk dipapar" - -#: js/messages.php:70 -#, fuzzy -msgid "Create Table" -msgstr "Cipta Halaman baru" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Cari" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Pengubahsuaian telah disimpan" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 #, fuzzy msgid "Relation deleted" msgstr "Paparan Hubungan" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 #, fuzzy msgid "Internal relation added" msgstr "Ciri-ciri hubungan am" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Ciri-ciri hubungan am" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Tidak Membenarkan" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Pilih Medan untuk dipapar" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "Tiada" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Terdahulu" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Berikut" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Jumlah" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Binari" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Mac" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Apr" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Mei" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Jun" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Jul" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Ogos" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Okt" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Jan" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Feb" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mac" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Apr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1302,176 +1130,176 @@ msgid "May" msgstr "Mei" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Jun" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Jul" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Ogos" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Sept" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Okt" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Nov" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Dis" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Aha" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Isn" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Sel" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Jum" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Aha" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Isn" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Sel" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Rab" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Kha" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Jum" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sab" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Aha" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Isn" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Sel" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Rab" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Kha" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Jum" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Sab" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "sedang digunakan" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "Records" msgid "Second" @@ -1528,7 +1356,7 @@ msgstr "Indeks" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unik" @@ -1547,7 +1375,7 @@ msgid "Comment" msgstr "Komen" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1570,8 +1398,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "pangkalan data" @@ -1734,11 +1562,7 @@ msgstr "Katalaluan:" msgid "Server Choice" msgstr "Pilihan Pelayan" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Cecikut mestilah dihidupkan ketika ini." @@ -1818,11 +1642,7 @@ msgstr "" "Tidak boleh menggunakan fungsi iconv mahupun libiconv mahupun recode_string " "apabila sambungan lapuran dimuat. Periksa konfigurasi php anda." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Jika kamu terima laman kosong, semuanya berjalan lancar." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" msgstr "" "$cfg[PmaAbsoluteUri] MESTI disetkan di dalam fail konfigurasi." -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Pelayan" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "" @@ -1925,7 +1717,7 @@ msgstr "Hantar" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentasi" @@ -1939,136 +1731,136 @@ msgstr "kueri-SQL" msgid "MySQL said: " msgstr "MySQL berkata: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Terangkan Kod SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Skip Explain SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "Tanpa Kod PHP" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Cipta Kod PHP" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Melangkau Pengesahan SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Mengesahkan SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Masa" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Bytes" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%B %d, %Y at %I:%M %p" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s hari, %s jam, %s minit dan %s saat" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Mula" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Terdahulu" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Tamat" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "" -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2087,7 +1879,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Nama" @@ -2115,16 +1907,16 @@ msgstr "Kueri" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 #, fuzzy msgid "Import" msgstr "Eksport" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privilej" @@ -2143,11 +1935,7 @@ msgid "" msgstr "" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Melebihi" @@ -2164,7 +1952,7 @@ msgstr "" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2174,36 +1962,22 @@ msgid "Change password" msgstr "Ubah Katalaluan" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Tiada Katalaluan" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Katalaluan" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Ulang-taip" @@ -2216,20 +1990,12 @@ msgid "MySQL 4.0 compatible" msgstr "" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master #, fuzzy msgid "Generate" msgstr "Dijana oleh" @@ -2243,17 +2009,23 @@ msgstr "Cipta pangkalan data baru" msgid "Create" msgstr "Cipta" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Tiada Privilej" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "You have to choose at least one column to display" +msgid "Table must have at least one column." +msgstr "Anda mesti pilih sekurang-kurangnya satu Kolum untuk dipapar" + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Cipta jadual baru pada pangkalan data %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of rows per page" msgid "Number of columns" @@ -2316,11 +2088,7 @@ msgid "remember template" msgstr "" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Fail bagi set Aksara:" @@ -2331,7 +2099,7 @@ msgstr "Mampatan" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Tiada" @@ -2373,11 +2141,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Lokasi bagi fail teks" @@ -2385,20 +2149,12 @@ msgstr "Lokasi bagi fail teks" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Direktori muatnaik yang telah ditetapkan tidak dapat dicapai" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "direktori muatnaik pelayan-web" @@ -2527,11 +2283,7 @@ msgstr "" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "Operasi" @@ -2603,14 +2355,14 @@ msgstr "Papar baris" msgid "total" msgstr "jumlah" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Ubah" @@ -2678,11 +2430,7 @@ msgstr "" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Jumlah" @@ -2928,11 +2676,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Format" @@ -3004,13 +2748,8 @@ msgstr "" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Data" @@ -3060,15 +2799,9 @@ msgstr "" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Hos" @@ -3267,7 +3000,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Tiada Jadual" @@ -3280,7 +3013,7 @@ msgstr "Hasil SQL" msgid "Generated by" msgstr "Dijana oleh" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL memulangkan set hasil kosong (i.e. sifar baris)" @@ -3427,20 +3160,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Utama" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Indeks" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Tekspenuh" @@ -3666,6 +3399,10 @@ msgstr "" msgid "not OK" msgstr "tidak OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Membenarkan" @@ -3687,7 +3424,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Tandabuku kueri-SQL" @@ -3738,13 +3475,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Kata Pengenalan" @@ -3762,22 +3494,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Pembolehubah" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Nilai" @@ -3796,40 +3520,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Sebarang pengguna" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Sebarang hos" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Local" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3853,7 +3548,6 @@ msgid "Use Host Table" msgstr "" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3888,30 +3582,30 @@ msgstr "" msgid "Servers" msgstr "Pelayan" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Pemboleh-pembolehubah" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 #, fuzzy msgid "Binary log" msgstr "Binari" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Proses-proses" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3940,51 +3634,51 @@ msgstr "" msgid "Target database" msgstr "Cari di pangkalan data" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, fuzzy, php-format msgid "Run SQL query/queries on server %s" msgstr "Laksana kueri SQL pada pangkalan data %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Laksana kueri SQL pada pangkalan data %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Nama Kolum" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "andabuku kueri-SQL ini" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Papar kueri ini di sini lagi " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Hantar" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Paparan sahaja" @@ -4157,12 +3851,12 @@ msgstr "" msgid "Save" msgstr "Simpan" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format msgid "Add %s column(s)" msgstr "Tambah medan baru" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to add at least one column." @@ -4298,8 +3992,8 @@ msgstr "Ulangtetap" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Pengguna" @@ -4731,111 +4425,111 @@ msgstr "" msgid "View dump (schema) of databases" msgstr "Lihat longgokan (skema) pangkalan data" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "" -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "" -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "" -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "" -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "" -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "" -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "" -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "" -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "" -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "" -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "" -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "" -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "" -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "" -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "" -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Limits the number of new connections the user may open per hour." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Limits the number of queries the user may send to the server per hour." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4843,219 +4537,219 @@ msgstr "" "Limits the number of commands that change any table or database the user may " "execute per hour." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 #, fuzzy msgid "Limits the number of simultaneous connections the user may have." msgstr "Limits the number of new connections the user may open per hour." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "" -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "" -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "" -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "" -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "" -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " "killing threads of other users." msgstr "" -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "" -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 #, fuzzy msgid "No privileges." msgstr "Tiada Privilej" -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Tiada" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Nota: Nama privilej MySQL adalah dinyatakan dalam B.Inggeris " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 #, fuzzy msgid "Global privileges" msgstr "Tiada Privilej" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" -#: server_privileges.php:709 +#: server_privileges.php:708 #, fuzzy msgid "Login Information" msgstr "Informasi MasaJana" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Jangan tukar katalaluan" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Tiada pengguna dijumpai." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Anda telah menambah pengguna baru." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Anda telah mengemaskini privilej bagi %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Anda telah menarikbalik privilej Keistimewaan untuk %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "" -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "" -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "" -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Ubah Privilej" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "TarikBalik" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 #, fuzzy msgid "Grant" msgstr "Cetak" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Sebarang" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Tambah Pengguna Baru" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "" -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5064,91 +4758,91 @@ msgid "" "sreload the privileges%s before you continue." msgstr "" -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "" -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "" -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "" -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr "" -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Tiada" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "" @@ -7760,25 +7454,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Label" @@ -7830,13 +7524,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Kembali ke muka sebelumnya" @@ -7916,7 +7603,7 @@ msgstr "(\"PRIMARY\" mesti nama dan semesti dari kekunci utama!)" msgid "Add to index  %s column(s)" msgstr "Tambah ke indeks  %s kolum" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -8032,41 +7719,6 @@ msgstr "Semak integriti rujukan:" msgid "Show tables" msgstr "Papar jadual" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Penggunaan ruang" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Penggunaan" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Berkesan" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Statistik Baris" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Penyataan" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinamik" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Panjang baris" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Penggunaan ruang" @@ -8100,7 +7752,6 @@ msgid "Row length" msgstr "Panjang baris" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Saiz baris " @@ -8172,49 +7823,49 @@ msgstr "Tiada" msgid "Column %s has been dropped" msgstr "Jadual %s telah digugurkan" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Kekunci utama telah ditambah pada %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Indeks telah ditambah pada %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Paparan Hubungan" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Cadangkan struktur jadual" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy msgid "Add column" msgstr "Tambah medan baru" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Pada Akhir Jadual" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Pada Awalan Jadual" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Selepas %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Cipta indeks pada  %s " -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8256,6 +7907,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8557,6 +8212,10 @@ msgstr "Tukarnama jadual ke" #~ msgid "Process list" #~ msgstr "Senarai Proses" +#, fuzzy +#~ msgid "Reload privileges" +#~ msgstr "Tiada Privilej" + #, fuzzy #~| msgid "Select All" #~ msgctxt "Create SELECT * query" diff --git a/po/nb.po b/po/nb.po old mode 100755 new mode 100644 index bbe2590af..fc5f673a9 --- a/po/nb.po +++ b/po/nb.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-06-09 14:17+0200\n" "Last-Translator: \n" "Language-Team: norwegian \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Vis alle" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Søk" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Utfør" @@ -113,7 +93,7 @@ msgstr "Bruk denne verdien" msgid "Database %1$s has been created." msgstr "Databasen %1$s har blitt opprettet." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Database kommentar: " @@ -138,17 +118,10 @@ msgstr "Kolonne" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Type" @@ -161,7 +134,7 @@ msgstr "Type" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -185,24 +158,18 @@ msgstr "Linker til" msgid "Comments" msgstr "Kommentarer" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Nei" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -211,15 +178,9 @@ msgstr "Nei" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -238,135 +199,127 @@ msgstr "Vis dump (skjema) av database" msgid "No tables found in database." msgstr "Ingen tabeller i databasen." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Velg alle" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Fjern alle valgte" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Databasen er uten navn!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Databasen %s har endret navn til %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Databasen %s har blitt kopiert til %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Endre databasens navn til" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Kommando" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "og så" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Kopier databasen til" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Kun struktur" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Struktur og data" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Bare data" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREATE DATABASE før kopiering" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Legg til %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Legg til AUTO_INCREMENT verdi" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Legg til begrensninger" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Bytt til kopiert database" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "BLOB lager" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Status" -#: db_operations.php:559 +#: db_operations.php:548 msgctxt "BLOB repository" msgid "Enabled" msgstr "Påslått" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Avslå" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Skadet" -#: db_operations.php:577 +#: db_operations.php:566 msgctxt "BLOB repository" msgid "Repair" msgstr "Reparer" -#: db_operations.php:585 +#: db_operations.php:574 msgctxt "BLOB repository" msgid "Disabled" msgstr "Avslått" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Slå på" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Sammenligning" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -375,14 +328,14 @@ msgstr "" "Tilleggsfunksjonene for å kunne jobbe med koblede tabeller er deaktivert. " "For å finne ut hvorfor, klikk %sher%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Rediger PDF-sider" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -391,11 +344,7 @@ msgstr "Tabell" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Rader" @@ -403,42 +352,30 @@ msgstr "Rader" msgid "Size" msgstr "Størrelse" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "i bruk" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Opprettet" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Sist oppdatert" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Sist kontrollert" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, php-format msgid "%s table" msgid_plural "%s tables" @@ -498,11 +435,7 @@ msgstr "Slett" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Eller" @@ -532,120 +465,120 @@ msgstr "Bruk tabeller" msgid "SQL query on database %s:" msgstr "SQL-spørring i database %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Kjør spørring" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Ingen tilgang" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "minst ett av ordene" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "alle ordene" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "med den nøyaktige setningen" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "som \"regular expression\"" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Søkeresultat for \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s treff i tabell %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Se på" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Slett" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Totalt: %s treff" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Søk i database" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Ord eller verdi(er) å søke etter (jokertegn: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Finn:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Ord er separert med et mellomrom (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "I tabell(ene):" -#: db_search.php:367 +#: db_search.php:355 msgid "Inside column:" msgstr "I kolonne:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Sett inn" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Struktur" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Slett" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Tøm" @@ -655,117 +588,111 @@ msgstr "Tøm" msgid "Table %s has been emptied" msgstr "Tabellen %s har blitt tømt" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Visningen %s har blitt slettet" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Tabellen %s har blitt slettet" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "Overvåkning er aktiv." -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "Overvåkning er ikke aktiv." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "Denne visningen har minst dette antall rader. Sjekk %sdocumentation%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Vis" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replikering" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Sum" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s er standard lagringsmotor for denne MySQL tjeneren." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Med avkrysset:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Merk alle" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Fjern merking" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Merk overheng" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Utskriftsvennlig forhåndsvisning" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Kontroller tabell" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimiser tabell" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Reparer tabell" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analyser tabell" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Eksporter" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Dataordbok" @@ -776,10 +703,10 @@ msgstr "Overvåkede tabeller" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -799,8 +726,8 @@ msgstr "Oppdatert" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Handling" @@ -834,8 +761,8 @@ msgstr "Strukturøyeblikksbilde" msgid "Untracked tables" msgstr "Ikke overvåkede tabeller" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "Overvåk tabell" @@ -918,7 +845,7 @@ msgstr "Bokmerket har blitt slettet." msgid "Showing bookmark" msgstr "Vis bokmerke" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Bokmerke %s opprettet" @@ -1003,425 +930,316 @@ msgstr "Vertsnavnet er tomt!" msgid "The user name is empty!" msgstr "Brukernavnet er tomt!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Passordet er blankt!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Passordene er ikke like!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Legg til en ny bruker" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create version" -msgid "Create User" -msgstr "Opprett versjon" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reloading the privileges" -msgid "Reloading Privileges" -msgstr "Oppfrisker privilegiene" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Fjern valgte brukere" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "Lukk" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Avbryt" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Last" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Prosesser" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Endre databasens navn til" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Database" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Kopier databasen til" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Tegnsett" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one column." -msgid "Table must have atleast 1 column" -msgstr "Tabellen må ha minst en kolonne." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Opprett tabell" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Søk" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Endringene er lagret" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Relasjon slettet" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "FOREIGN KEY relasjon lagt til" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Intern relasjon lagt til" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Feil: Relasjon ikke opprettet." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Feil: relasjoner eksisterer allerede." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Feil oppstod under lagring av Designerkoordinater." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Generelle relasjonsegenskaper" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Avslått" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Velg referert nøkkel" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Velg fremmednøkkel" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Velg primærnøkkelen eller en unik nøkkel" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 msgid "Choose column to display" msgstr "Velg kolonne for visning" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 msgid "Done" msgstr "Utført" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 msgid "Prev" msgstr "Forrige" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Neste" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 msgid "Today" msgstr "I dag" -#: js/messages.php:111 +#: js/messages.php:82 msgid "January" msgstr "Januar" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "Februar" -#: js/messages.php:113 +#: js/messages.php:84 msgid "March" msgstr "Mars" -#: js/messages.php:114 +#: js/messages.php:85 msgid "April" msgstr "April" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Mai" -#: js/messages.php:116 +#: js/messages.php:87 msgid "June" msgstr "Juni" -#: js/messages.php:117 +#: js/messages.php:88 msgid "July" msgstr "Juli" -#: js/messages.php:118 +#: js/messages.php:89 msgid "August" msgstr "August" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "September" -#: js/messages.php:120 +#: js/messages.php:91 msgid "October" msgstr "Oktober" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "November" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "Desember" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Jan" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Feb" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Apr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 msgctxt "Short month name" msgid "May" msgstr "Mai" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Jun" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Jul" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Aug" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Sep" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Okt" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Nov" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Des" -#: js/messages.php:151 +#: js/messages.php:122 msgid "Sunday" msgstr "Søndag" -#: js/messages.php:152 +#: js/messages.php:123 msgid "Monday" msgstr "Mandag" -#: js/messages.php:153 +#: js/messages.php:124 msgid "Tuesday" msgstr "Tirsdag" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "Onsdag" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "Torsdag" -#: js/messages.php:156 +#: js/messages.php:127 msgid "Friday" msgstr "Fredag" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "Lørdag" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Søn" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Man" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Tir" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Ons" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Tor" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Fre" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Lør" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 msgid "Su" msgstr "Søndag" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 msgid "Mo" msgstr "Man" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 msgid "Tu" msgstr "Tir" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 msgid "We" msgstr "Ons" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 msgid "Th" msgstr "Tor" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 msgid "Fr" msgstr "Fre" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 msgid "Sa" msgstr "Lør" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "Uke" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "Time" -#: js/messages.php:194 +#: js/messages.php:165 msgid "Minute" msgstr "Minutt" -#: js/messages.php:195 +#: js/messages.php:166 msgid "Second" msgstr "Sekund" @@ -1481,7 +1299,7 @@ msgstr "Indekser" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unik" @@ -1499,7 +1317,7 @@ msgid "Comment" msgstr "Kommentar" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1524,8 +1342,8 @@ msgstr "" "Indeksene %1$s og %2$s ser ut til å være like og en av dem burde kunne " "fjernes." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Databaser" @@ -1694,11 +1512,7 @@ msgstr "Passord:" msgid "Server Choice" msgstr "Tjenervalg" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Cookies må være slått på forbi dette punkt." @@ -1779,11 +1593,7 @@ msgstr "" "Kan ikke bruke hverken iconv, libiconv eller recode_string funksjonene selv " "om modulene sier de er lastet. Sjekk din php-konfigurasjon." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Hvis du får en blank side så er alt ok." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "Kunne ikke laste standard konfigurasjonsfil fra: %1$s" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1819,47 +1621,27 @@ msgstr "" "$cfg['PmaAbsoluteUri'] variabelen MÅ være innstilt i din " "konfigurasjonsfil!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "Ugyldig tjenerindeks: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "Ugyldig tjenernavn for tjener %1$s. Kontroller din konfigurasjon." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Tjener" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Ugyldig autentiseringsmetode satt opp i konfigureringen:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Ugyldig autentiseringsmetode satt opp i konfigureringen:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Du burde oppgradere til %s %s eller nyere." @@ -1885,7 +1667,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentasjon" @@ -1899,136 +1681,136 @@ msgstr "SQL-spørring" msgid "MySQL said: " msgstr "MySQL sa: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Forklar SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Ikke forklar SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "uten PHP kode" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Lag PHP kode" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Oppdater" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Ikke teste SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Test SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "Inline redigering av denne spørringa" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "Inline" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Profilering" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Tid" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "B" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EiB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "." #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d. %B, %Y %H:%M %p" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s dager, %s timer, %s minutter og %s sekunder" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Start" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Forrige" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Slutt" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Hopp til databasen "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "Funksjonaliteten %s er påvirket av en kjent feil, se %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2048,7 +1830,7 @@ msgid "Events" msgstr "Hendelser" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Navn" @@ -2076,15 +1858,15 @@ msgstr "Spørring ved eksempel (Query by Example)" msgid "Designer" msgstr "Designer" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Importer" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privilegier" @@ -2103,11 +1885,7 @@ msgid "" msgstr "Kan være unøyaktig. Se FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Overheng" @@ -2125,7 +1903,7 @@ msgstr "Tjeneren svarer ikke" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(eller den lokale MySQL tjenerens sokkel er ikke korrekt konfigurert)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Detaljer..." @@ -2135,36 +1913,22 @@ msgid "Change password" msgstr "Endre passord" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Intet passord" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Passord" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Gjenta" @@ -2177,20 +1941,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 kompatibel" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Generer passord" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Generer" @@ -2203,17 +1959,21 @@ msgstr "Opprett ny database" msgid "Create" msgstr "Opprett" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Ingen privilegier" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +msgid "Table must have at least one column." +msgstr "Tabellen må ha minst en kolonne." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Opprett ny tabell i database %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 msgid "Number of columns" msgstr "Antall kolonner" @@ -2275,11 +2035,7 @@ msgid "remember template" msgstr "husk malen" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Filens tegnsett:" @@ -2290,7 +2046,7 @@ msgstr "Kompresjon" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Ingen" @@ -2336,11 +2092,7 @@ msgstr "" msgid "File to import" msgstr "Fil for importering" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Plassering av filen" @@ -2348,20 +2100,12 @@ msgstr "Plassering av filen" msgid "File uploads are not allowed on this server." msgstr "Filopplastinger er ikke tillatt på denne tjeneren." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Katalogen du anga for opplasting kan ikke nåes" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "webtjener opplastingskatalog" @@ -2493,11 +2237,7 @@ msgstr "Sorter etter nøkkel" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Innstillinger" @@ -2565,14 +2305,14 @@ msgstr "Viser rader " msgid "total" msgstr "totalt" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Spørring tok %01.4f sek" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Endre" @@ -2642,11 +2382,7 @@ msgstr "Mellomlagerbruk" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Totalt" @@ -2931,11 +2667,7 @@ msgstr "" "neste høyeste nummeret." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Format" @@ -2999,13 +2731,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Data" @@ -3054,15 +2781,9 @@ msgstr "MIME-type" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Vert" @@ -3255,7 +2976,7 @@ msgstr "Eksporter innhold" msgid "Open new phpMyAdmin window" msgstr "Åpne nytt phpMyAdmin vindu" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "Ny tabell" @@ -3267,7 +2988,7 @@ msgstr "SQL-resultat" msgid "Generated by" msgstr "Generert av" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL returnerte ett tomt resultat (m.a.o. ingen rader)." @@ -3415,20 +3136,20 @@ msgstr "Konverter til Kana" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primær" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Indeks" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Fulltekst" @@ -3653,6 +3374,10 @@ msgstr "Dette formatet har ingen valg" msgid "not OK" msgstr "ikke OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Påslått" @@ -3674,7 +3399,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "Les i dokumentasjonen hvordan du oppdaterer din Column_comments tabell" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Lagret SQL-spørring" @@ -3730,13 +3455,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Brukernavn" @@ -3753,22 +3473,14 @@ msgstr "Masterstatus" msgid "Slave status" msgstr "Slavestatus" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Variabler" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Verdi" @@ -3788,40 +3500,11 @@ msgstr "" msgid "Add slave replication user" msgstr "Legg til slavereplikasjonsbruker" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Alle brukere" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Bruk tekstfelt" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Alle verter" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Lokal" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Denne vert" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Vis vert tabell" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3845,7 +3528,6 @@ msgid "Use Host Table" msgstr "Vis vert tabell" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3881,29 +3563,29 @@ msgstr "Ukjent språk: %1$s." msgid "Servers" msgstr "Tjenere" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Variabler" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Tegnsett" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Motorer" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Binærlogg" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Prosesser" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Synkroniser" @@ -3930,49 +3612,49 @@ msgstr "Differanse" msgid "Target database" msgstr "Måldatabase" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Kjør SQL spørring/spørringer på tjener %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Kjør SQL spørring/spørringer mot databasen %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 msgid "Columns" msgstr "Kolonner" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Lagre denne SQL-spørringen" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "La alle brukere ha adgang til dette bokmerket" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Erstatt eksisterende bokmerke med samme navn" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Ikke overskriv denne spørringen fra andre vinduer" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Skilletegn" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Vis denne spørring her igjen " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Send" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Bare se" @@ -4143,12 +3825,12 @@ msgstr "Partisjonsdefinisjon" msgid "Save" msgstr "Lagre" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, php-format msgid "Add %s column(s)" msgstr "Legg til %s kolonne(r)" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 msgid "You have to add at least one column." msgstr "Du må sette inn minst en kolonne." @@ -4320,8 +4002,8 @@ msgstr "Tilbakestill" msgid "Protocol version" msgstr "Protokollversjon" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Bruker" @@ -4763,113 +4445,113 @@ msgstr "Lagringsmotorer" msgid "View dump (schema) of databases" msgstr "Vis dumpet skjema av databaser" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Inkluder alle privilegier unntatt GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Tillater endring av struktur på eksisterende tabeller." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Tillater endring og sletting av lagrede rutiner." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Tillater oppretting av nye databaser og tabeller." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Tillater oppreting av lagrede rutiner." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Tillater oppretting av nye tabeller." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Tillater oppretting av midlertidige tabeller." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Tillater oppretting, sletting og navneendring av brukerkontoer." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Tillater oppretting av nye visninger." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Tillater sletting av data." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Tillater sletting av databaser og tabeller." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Tillater sletting av tabeller." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Tillater å sette opp hendelser for hendelseskalenderen" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Tillater utføring av lagrede rutiner." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Tillater import og eksport av data til og fra filer." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Tillater å legge til brukere og privilegier uten å oppfriske " "privilegietabellene." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Tillater oppretting og sletting av indekser." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Tillater å legge til og erstatte data." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Tillater låsing av tabeller for den kjørende tråden." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Begrenser antall nye tilkoblinger brukeren kan åpne per time." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Begrenser antall spørringer brukeren kan sende til tjeneren per time." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4877,61 +4559,61 @@ msgstr "" "Begrenser antall kommandoer som kan endre tabeller eller databaser brukeren " "kan utføre per time." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Begrens antall samtidige tilkoblinger brukeren kan ha." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Tillater visning av prosessene til alle brukere" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "har ingen effekt i denne versjonen av MySQL." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Tillater oppfrisking av tjenerinnstillinger og oppfrisking av mellomlager." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" "Gir tillatelse til brukeren til å spørre hvor replikasjonsslaver eller -" "tjenere er." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Trenges av replikasjonsslavene." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Tillater lesing av data." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Gir adgang til komplett liste over databaser." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Tillater utføring av SHOW CREATE VIEW spørringer." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Tillater avslutting av tjener." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -4941,152 +4623,152 @@ msgstr "" "fleste administrative operasjoner som å sette globale variabler eller " "avslutting av andre brukeres tråder." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Tillater opprettelse og sletting av triggere" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Tillater endring av data." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Ingen privilegier." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 msgctxt "None privileges" msgid "None" msgstr "Ingen" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Tabell-spesifikke privilegier" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr "OBS: MySQL privilegiumnavn er på engelsk" -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Globale privilegier" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Databasespesifikke privilegier" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administrasjon" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Ressursbegrensninger" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Merk: Ved å sette disse til 0 (null) fjernes begrensningen." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Innlogingsinformasjon" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Ikke endre passordet" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 msgid "No user found." msgstr "Ingen bruker(e) funnet." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Brukeren %s finnes fra før!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Du har lagt til en ny bruker." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Du har oppdatert privilegiene til %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Du har fjernet privilegiene til %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Passordet til %s er endret." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Sletter %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Ingen brukere merket for sletting!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Oppfrisker privilegiene" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "De valgte brukerne har blitt slettet." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Oppfriskingen av privilegiene lyktes." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Rediger privilegier" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Tilbakekall" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Brukeroversikt" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Rettighet" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Alle" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Legg til en ny bruker" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Fjern valgte brukere" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Tilbakekall alle aktive privilegier fra brukerne og slett dem etterpå." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Slett databasene som har det samme navnet som brukerne." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5099,91 +4781,91 @@ msgstr "" "privilegiene tjeneren bruker hvis det er utført manuelle endringer på den. I " "så fall bør du %soppfriske privilegiene%s før du fortsetter." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Den valgte brukeren ble ikke funnet i privilegietabellen." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Kolonne-spesifikke privilegier" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Legg til privilegier til følgende database" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "Jokertegnene _ og % må beskyttes med en \\ for å bruke dem direkte" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Legg til privilegier til følgende tabell" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Endre innloggingsinformasjon / kopiere bruker" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Opprett ny bruker med de samme privilegier og ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... behold den gamle." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... slett den gamle fra brukertabellene." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... tilbakekall alle aktive privilegier fra den gamle og slett den etterpå." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" " ... slett den gamle fra brukertabellene og deretter oppfrisk privilegiene." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Brukerdatabase" -#: server_privileges.php:2060 +#: server_privileges.php:2037 msgctxt "Create none database for user" msgid "None" msgstr "Ingen" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Opprett database med samme navn og gi alle rettigheter" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Gi alle rettigheter på jokertegnavn (username\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "Gi alle privilegier for databasen "%s"" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Brukere som har adgang til "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "global" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "databasespesifikk" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "jokertegn" @@ -8075,25 +7757,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "Insatt rad id: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Viser som PHP kode" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Viser SQL spørring" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Problemer med indeksene i tabellen `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Navn" @@ -8145,13 +7827,6 @@ msgstr "Sett inn som ny rad og ignorer feil" msgid "Show insert query" msgstr "Viser SQL spørring" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "og så" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Returner" @@ -8233,7 +7908,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Legg til indeks %s kolonne(r)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Antall kolonner må være større enn null." @@ -8345,41 +8020,6 @@ msgstr "Sjekk referanseintegritet:" msgid "Show tables" msgstr "Vis tabeller" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Plassbruk" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Bruk" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Effektiv" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Radstatistikk" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Oversikt" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "statisk" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dynamisk" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Radlengde" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Plassbruk" @@ -8413,7 +8053,6 @@ msgid "Row length" msgstr "Radlengde" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Radstørrelse " @@ -8482,47 +8121,47 @@ msgstr "Ingen" msgid "Column %s has been dropped" msgstr "Kolonne %s har blitt slettet" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "En primærnøkkel har blitt lagt til %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "En indeks har blitt lagt til %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Relasjonsvisning" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Foreslå tabellstruktur" -#: tbl_structure.php:538 +#: tbl_structure.php:540 msgid "Add column" msgstr "Legg til kolonne(r)" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Ved slutten av tabellen" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Ved begynnelsen av tabellen" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Etter %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, php-format msgid "Create an index on  %s columns" msgstr "Lag en indeks på %s kolonner" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "partisjonert" @@ -8566,6 +8205,10 @@ msgstr "Kommenter ut disse to linjene hvis du ikke trenger dem." msgid "SQL statements exported. Please copy the dump or execute it." msgstr "SQL spørringer eksportert. Venligst kopier dumpen eller utfør den." +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "Lukk" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/nl.po b/po/nl.po old mode 100755 new mode 100644 index 30545dc39..b86a5970c --- a/po/nl.po +++ b/po/nl.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-05-31 01:06+0200\n" "Last-Translator: Bjorn \n" "Language-Team: dutch \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Toon alles" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Zoeken" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Start" @@ -113,7 +93,7 @@ msgstr "Gebruik deze waarde" msgid "Database %1$s has been created." msgstr "Database %1$s is aangemaakt." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Database commentaar: " @@ -140,17 +120,10 @@ msgstr "Kolom namen" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Type" @@ -163,7 +136,7 @@ msgstr "Type" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -187,24 +160,18 @@ msgstr "Gelinkt naar" msgid "Comments" msgstr "Commentaar" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Nee" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -213,15 +180,9 @@ msgstr "Nee" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -240,139 +201,131 @@ msgstr "Bekijk een dump (schema) van database" msgid "No tables found in database." msgstr "Geen tabellen gevonden in de database." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Selecteer alles" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Deselecteer alles" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "De database naam is leeg!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Database %s is hernoemd naar %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Database %s is gekopieerd naar %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Hernoem database naar" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Commando" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "en dan" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Kopieer database naar" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Alleen structuur" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Structuur en gegevens" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Alleen data" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREATE DATABASE voor het kopiëren" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Voeg %s toe" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Voeg AUTO_INCREMENT waarde toe" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Voeg beperkingen toe" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Schakel naar de gekopieerde database" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "BLOB Bewaarplaats" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Status" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Ingeschakeld" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Uitschakelen" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Beschadigd" -#: db_operations.php:577 +#: db_operations.php:566 msgctxt "BLOB repository" msgid "Repair" msgstr "Herstel" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Uitgeschakeld" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Inschakelen" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Collatie" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -381,14 +334,14 @@ msgstr "" "Extra opties om met tabellen te werken, die gelinkt zijn, zijn " "uitgeschakeld. Om te weten te komen waarom klik %shier%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "PDF Pagina's aanpassen" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -397,11 +350,7 @@ msgstr "Tabel" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Rijen" @@ -409,42 +358,30 @@ msgstr "Rijen" msgid "Size" msgstr "Grootte" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "in gebruik" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Gecreëerd" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Laatst bijgewerkt" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Laatst gecontroleerd" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -505,11 +442,7 @@ msgstr "Verwijder" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Of" @@ -543,85 +476,85 @@ msgstr "Gebruik tabellen" msgid "SQL query on database %s:" msgstr "SQL-query op database %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Query uitvoeren" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Toegang geweigerd " -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "ten minste een van de woorden" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "alle woorden" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "de exacte zin" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "als een reguliere expressie" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Zoek resultaten voor \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s overeenkomst(en) in de tabel %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Verkennen" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Verwijderen" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Totaal: %s overeenkomst(en)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Zoeken in de database" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Woord(en) of waarde(s) waarnaar gezocht moet worden (wildcard: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Zoek:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Woorden worden gesplits door een spatiekarakter (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "In de tabel(len):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -629,36 +562,36 @@ msgstr "In het veld:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Invoegen" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Structuur" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Verwijderen" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Legen" @@ -668,25 +601,25 @@ msgstr "Legen" msgid "Table %s has been emptied" msgstr "Tabel %s is leeg gemaakt" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "View %s is verwijderd" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Tabel %s is vervallen" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "Tracking is ingeschakeld." -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "Tracking is niet actief." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -694,92 +627,86 @@ msgid "" msgstr "" "Deze view heeft minimaal deze hoeveelheid aan rijen. Zie de %sdocumentatie%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "View" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replicatie" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Som" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s is de standaard storage engine op deze MySQL-server." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Met geselecteerd:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Selecteer alles" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Deselecteer alles" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Selecteer tabellen met overhead" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Afdrukken" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Controleer tabel" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimaliseer tabel" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Repareer tabel" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analyseer tabel" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Exporteer" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Data Woordenboek" @@ -790,10 +717,10 @@ msgstr "Tabellen met tracker" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -813,8 +740,8 @@ msgstr "Bijgewerkt" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Actie" @@ -848,8 +775,8 @@ msgstr "Structuur-snapshot" msgid "Untracked tables" msgstr "Tabellen zonder tracker" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "Tabel tracken" @@ -936,7 +863,7 @@ msgstr "De boekenlegger (Bookmark) is verwijderd." msgid "Showing bookmark" msgstr "Toon bookmark" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Bookmark %s aangemaakt" @@ -1024,278 +951,169 @@ msgstr "De machinenaam is leeg!" msgid "The user name is empty!" msgstr "De gebruikersnaam is leeg!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Het wachtwoord is leeg!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "De wachtwoorden zijn niet gelijk!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Voeg een nieuwe gebruiker toe" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create version" -msgid "Create User" -msgstr "Versie aanmaken" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reloading the privileges" -msgid "Reloading Privileges" -msgstr "Bezig de privileges te verversen" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Verwijder de geselecteerde gebruikers" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "Sluiten" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Annuleren" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Laden" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Processen" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "Correct" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Hernoem database naar" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Database" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Kopieer database naar" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Karakterset" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Tabel moet minimaal een veld hebben." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Maak tabel" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Zoeken" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Wijzigingen opgeslagen." -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Relatie verwijderd" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "Vreemde sleutel(FOREIGN KEY) relatie toegevoegd" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Interne relatie toegevoegd" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Fout: Relatie niet toegevoegd." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Fout: relatie bestaat reeds." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Fout bij het opslaan van coördinaten voor de Designer." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Basis relatie opties" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Uitgeschakeld" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Selecteer de gerefereerde sleutel" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Selecteer vreemde sleutel" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Selecteer de primaire sleutel of een unieke sleutel" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Kies weer te geven veld" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 msgid "Done" msgstr "Klaar" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Vorige" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Volgende" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 msgid "Today" msgstr "Vandaag" -#: js/messages.php:111 +#: js/messages.php:82 msgid "January" msgstr "Januari" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "Februari" -#: js/messages.php:113 +#: js/messages.php:84 msgid "March" msgstr "Maart" -#: js/messages.php:114 +#: js/messages.php:85 msgid "April" msgstr "April" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Mei" -#: js/messages.php:116 +#: js/messages.php:87 msgid "June" msgstr "Juni" -#: js/messages.php:117 +#: js/messages.php:88 msgid "July" msgstr "Juli" -#: js/messages.php:118 +#: js/messages.php:89 msgid "August" msgstr "Augustus" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "September" -#: js/messages.php:120 +#: js/messages.php:91 msgid "October" msgstr "Oktober" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "November" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "December" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Jan" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Feb" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Apr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1303,162 +1121,162 @@ msgid "May" msgstr "Mei" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Jun" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Jul" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Aug" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Sept" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Oct" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Nov" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Dec" -#: js/messages.php:151 +#: js/messages.php:122 msgid "Sunday" msgstr "Zondag" -#: js/messages.php:152 +#: js/messages.php:123 msgid "Monday" msgstr "Maandag" -#: js/messages.php:153 +#: js/messages.php:124 msgid "Tuesday" msgstr "Dinsdag" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "Woensdag" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "Donderdag" -#: js/messages.php:156 +#: js/messages.php:127 msgid "Friday" msgstr "Vrijdag" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "Zaterdag" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Zo" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Ma" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Di" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Wo" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Do" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Vr" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Za" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 msgid "Su" msgstr "Zo" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Ma" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Di" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Wo" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Do" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Vr" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 msgid "Sa" msgstr "Za" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "Week" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "Uur" -#: js/messages.php:194 +#: js/messages.php:165 msgid "Minute" msgstr "Minuut" -#: js/messages.php:195 +#: js/messages.php:166 msgid "Second" msgstr "Seconde" @@ -1519,7 +1337,7 @@ msgstr "Indexen" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unieke waarde" @@ -1537,7 +1355,7 @@ msgid "Comment" msgstr "Opmerking" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1562,8 +1380,8 @@ msgstr "" "De indexen %1$s en %2$s lijken hetzelfde, mogelijk kan een van beide worden " "verwijderd." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Databases" @@ -1738,11 +1556,7 @@ msgstr "Wachtwoord:" msgid "Server Choice" msgstr "Serverkeuze" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Cookies moeten aan staan voorbij dit punt." @@ -1824,11 +1638,7 @@ msgstr "" "Kan iconv, libiconv en recode_string functies niet gebruiken hoewel de " "extensies geladen geladen lijken te zijn. Controleer de PHP configuratie." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "Standaard configuratiebestand kon niet geladen worden vanuit: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1866,48 +1668,28 @@ msgstr "" "De $cfg['PmaAbsoluteUri'] richtlijn MOET gezet zijn in het " "configuratiebestand!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Ongeldige serverindex: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "Ongeldige machinenaam voor server %1$s. Controleer uw configuratie." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Server" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Ongeldige authenticatiemethode opgegeven in configuratie:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Ongeldige authenticatiemethode opgegeven in configuratie:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "U moet opwaarderen (upgraden) naar %s %s of hoger." @@ -1933,7 +1715,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Documentatie" @@ -1947,137 +1729,137 @@ msgstr "SQL-query" msgid "MySQL said: " msgstr "MySQL retourneerde: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Verklaar SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Uitleg SQL overslaan" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "zonder PHP-Code" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Genereer PHP-Code" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Vernieuw" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "SQL-validatie overslaan" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Valideer SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "Rechtstreekse bewerking van deze query" # "Inline" vertaalt naar "rechtstreeks in het document", als het ware binnen iets anders. -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "Rechtstreeks" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Profiling" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Tijd" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Bytes" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "." #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d %B %Y om %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s dagen, %s uren, %s minuten en %s seconden" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Begin" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Vorige" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Einde" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Ga naar database "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "De %s functionaliteit heeft last van een bekend probleem, zie %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2098,7 +1880,7 @@ msgid "Events" msgstr "Gebeurtenissen" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Naam" @@ -2126,15 +1908,15 @@ msgstr "Query opbouwen" msgid "Designer" msgstr "Designer" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Importeer" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Rechten" @@ -2155,11 +1937,7 @@ msgstr "" "a]" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Overhead" @@ -2178,7 +1956,7 @@ msgstr "De server reageert niet" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(of de MySQL-server heeft het socket niet juist ingesteld)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Details..." @@ -2188,36 +1966,22 @@ msgid "Change password" msgstr "Wijzig wachtwoord" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Geen wachtwoord" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Wachtwoord" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Type opnieuw" @@ -2231,20 +1995,12 @@ msgid "MySQL 4.0 compatible" msgstr "Compatibel met MySQL 4.0" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Genereer wachtwoord" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Genereer" @@ -2257,17 +2013,23 @@ msgstr "Nieuwe database aanmaken" msgid "Create" msgstr "Aanmaken" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Geen rechten" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Tabel moet minimaal een veld hebben." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Nieuwe tabel aanmaken in database %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2334,11 +2096,7 @@ msgid "remember template" msgstr "Onthoud template" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Karakter set van het bestand:" @@ -2349,7 +2107,7 @@ msgstr "Compressie" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Geen" @@ -2396,11 +2154,7 @@ msgstr "" msgid "File to import" msgstr "Te importeren bestand" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Locatie van het tekstbestand" @@ -2408,21 +2162,13 @@ msgstr "Locatie van het tekstbestand" msgid "File uploads are not allowed on this server." msgstr "Het uploaden van bestanden is niet toegestaan op deze server." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "" "De directory die u heeft ingesteld om te uploaden kan niet worden bereikt." -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "web-server upload directory" @@ -2558,11 +2304,7 @@ msgstr "Sorteren op sleutel" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Opties" @@ -2632,14 +2374,14 @@ msgstr "Toon Records" msgid "total" msgstr "totaal" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Query duurde %01.4f sec" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Veranderen" @@ -2711,11 +2453,7 @@ msgstr "Buffer Pool Gebruik" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Totaal" @@ -3005,11 +2743,7 @@ msgstr "" "hernoemd met een opgehoogd volgnummer" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Opmaak" @@ -3083,13 +2817,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Data" @@ -3138,15 +2867,9 @@ msgstr "MIME-type" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Machine" @@ -3342,7 +3065,7 @@ msgstr "Exporteer inhoud" msgid "Open new phpMyAdmin window" msgstr "Open nieuw phpMyAdmin scherm" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "Nieuwe tabel" @@ -3354,7 +3077,7 @@ msgstr "SQL-resultaat" msgid "Generated by" msgstr "Gegenereerd door" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL gaf een lege resultaat set terug (0 rijen)." @@ -3504,20 +3227,20 @@ msgstr "Zet om naar Kana" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primaire sleutel" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Index" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Volledige tekst" @@ -3742,6 +3465,10 @@ msgstr "Dit format heeft geen opties" msgid "not OK" msgstr "Niet Goed" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "Correct" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Ingeschakeld" @@ -3764,7 +3491,7 @@ msgid "" msgstr "" "Raadpleeg de Documentatie over hoe u uw Column_comments tabel bijwerkt." -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Opgeslagen SQL-query" @@ -3824,13 +3551,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Gebruikersnaam" @@ -3847,22 +3569,14 @@ msgstr "Master status" msgid "Slave status" msgstr "Slave status" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Variabelen" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Waarde" @@ -3882,40 +3596,11 @@ msgstr "" msgid "Add slave replication user" msgstr "Voeg slave replicatie gebruiker toe" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Een willekeurige gebruiker" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Gebruik tekstveld" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Een willekeurige machine" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "lokaal" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Deze machine" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Gebruik Host Tabel" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3939,7 +3624,6 @@ msgid "Use Host Table" msgstr "Gebruik Host Tabel" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3975,29 +3659,29 @@ msgstr "Onbekende taal: %1$s." msgid "Servers" msgstr "Servers" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Variabelen" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Karaktersets" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Engines" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Binaire log" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Processen" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Synchronizatie" @@ -4024,51 +3708,51 @@ msgstr "Verschil" msgid "Target database" msgstr "Doel database" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Voer SQL query/queries uit op de server %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Draai SQL query/queries op database %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Kolom namen" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Sla deze SQL-query op" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Geef elke gebruiker toegang tot deze bookmark" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Bookmark met dezelfde naam overschrijven" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Overschrijf deze query niet vanuit een ander scherm" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Scheidingsteken" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Laat deze query hier zien " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Verzenden" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Alleen bekijken" @@ -4245,13 +3929,13 @@ msgstr "PARTITION definitie" msgid "Save" msgstr "Opslaan" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add column(s)" msgid "Add %s column(s)" msgstr "Kolom(men) toevoegen" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4470,8 +4154,8 @@ msgstr "Herstel" msgid "Protocol version" msgstr "Protocolversie" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Gebruiker" @@ -4933,117 +4617,117 @@ msgstr "Opslag Engines" msgid "View dump (schema) of databases" msgstr "Bekijk dump (schema) van de databases" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Bevat alle privileges behalve GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Maakt het mogelijk de structuur van bestaande tabellen aan te passen." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Maakt het mogelijk om stored routines te bewerken en te verwijderen." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Maakt het mogelijk om nieuwe databases en tabellen te maken." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Maakt het mogelijk om stored routines aan te maken." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Maakt het mogelijk nieuwe tabellen te maken." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Maakt het mogelijk om tijdelijke tabellen te maken." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" "Maakt het mogelijk om gebruikersaccounts te maken, hernoemen en verwijderen." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Maakt het mogelijk om nieuwe views te maken." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Maakt het mogelijk om data te verwijderen." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Maakt het mogelijk om databases en tabellen te verwijderen." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Maakt het mogelijk tabellen te verwijderen." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Maakt het mogelijk om gebeurtenissen in de planner te zetten" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Maakt het mogelijk om stored routines uit te voeren." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "" "Maakt het mogelijk om data te importeren en te exporteren van en naar " "bestanden." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Maakt het mogelijk dat gebruikers en privileges toe te voegen zonder de " "privilegestabel opnieuw op te vragen." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Maakt het mogelijk om indexen te creëren en te verwijderen." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Maakt het mogelijk om data in te voegen en te vervangen." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Maakt het mogelijk tabellen op slot te zetten voor de huidige thread." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Limiteert het aantal nieuwe connecties die een gebruiker per uur mag openen." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Limiteert het aantal queries dat een gebruiker mag versturen per uur." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5051,64 +4735,64 @@ msgstr "" "Limiteert het aantal commando's, welke een database of tabel veranderen, die " "een gebruiker per uur mag uitvoeren." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "" "Limiteert het aantal gelijktijdige verbindingen dat de gebruiker open kan " "hebben." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Maakt het mogelijk om processen van alle gebruikers te zien" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Heeft geen effect in deze MySQL versie." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Maakt het mogelijk om de serverinstellingen opnieuw op te vragen en de cache " "van de server leeg te maken." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" "Geeft het recht aan de gebruiker om te vragen waar de 'slaves' / 'masters' " "zijn." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Nodig om 'slaves' te repliceren." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Maakt het lezen van data mogelijk." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Geeft toegang tot de complete lijst van databases." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Maakt het mogelijk om SHOW CREATE VIEW queries uit te voeren." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Maakt het mogelijk om de server te stoppen." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5119,156 +4803,156 @@ msgstr "" "opties zoals het instellen van globale variabelen of het stoppen van threads " "van andere gebruikers." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Maakt het mogelijk om triggers maken en te verwijderen" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Maakt het mogelijk data aan te passen." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Geen privileges." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 msgctxt "None privileges" msgid "None" msgstr "Geen" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Tabel-specifieke privileges" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr "" " Aantekening: de namen van de MySQL rechten zijn uitgedrukt in het Engels " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Globale privileges" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Database-specifieke privileges" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administratie" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Resource-beperkingen" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" "Opmerking: Het instellen van deze waarden op 0 (nul) verwijdert de limiet." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Inloginformatie" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Wijzig het wachtwoord niet" # Enkelvoud. -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 msgid "No user found." msgstr "Geen gebruiker gevonden." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "De gebruiker %s bestaat al!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "U heeft een nieuwe gebruiker toegevoegd." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "U heeft de rechten aangepast voor %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "U heeft de rechten ingetrokken voor %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Het wachtwoord voor %s is succesvol veranderd." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Verwijderen van %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Geen gebruikers geselecteerd om te verwijderen!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Bezig de privileges te verversen" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "De geselecteerde gebruikers zijn met succes verwijderd." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "De privileges zijn succesvol vernieuwd" -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Wijzig rechten" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Ongedaan maken" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Gebruikers Overzicht" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Toekennen" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Elke" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Voeg een nieuwe gebruiker toe" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Verwijder de geselecteerde gebruikers" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Trek alle actieve privileges in van alle gebruikers en verwijder deze daarna." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Verwijder de databases die dezelfde naam hebben als de gebruikers." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5282,52 +4966,52 @@ msgstr "" "geval zijn dan moet men %sde privilege tabel vernieuwen%s voordat men verder " "gaat." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "" "De geselecteerde gebruiker werd niet aangetroffen in de privileges tabel" -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Kolom-specifieke privileges" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Voeg privileges toe aan de volgende database" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Wildcards _ en % moeten worden ge-escaped met een \\ om ze letterlijk te " "gebruiken" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Voeg privileges toe aan de volgende tabel" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Wijzig de Inlog Informatie / Kopieer gebruiker" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Maak een nieuwe gebruiker aan met dezelfde privileges en ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... behoud de oude." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... verwijder de oude van de user tabellen." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... herstel alle actieve privileges van de oude en verwijder deze daarna." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5335,44 +5019,44 @@ msgstr "" " ... verwijder de oude van de gebruikerstabellen en vernieuw de privileges " "achteraf." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Database voor gebruiker" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Geen" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Maak een database met dezelfde naam en geef alle rechten hierop" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Geef alle rechten op de wildcard naam (gebruikersnaam\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "Geef alle rechten op de database "%s"" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Gebruikers die toegang hebben tot "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "globaal" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "database-specifiek" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "jokerteken" @@ -8358,25 +8042,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "Toegevoegd rij nummer: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Getoond als PHP-code" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Toont SQL-query" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Problemen met de index(en) van de tabel `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Label" @@ -8429,13 +8113,6 @@ msgstr "" msgid "Show insert query" msgstr "Toont SQL-query" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "en dan" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Terug" @@ -8518,7 +8195,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Voeg  %s  kolom(men) toe aan index" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Het aantal kolommen moet groter dan nul zijn." @@ -8632,41 +8309,6 @@ msgstr "Controleer referentiële integriteit" msgid "Show tables" msgstr "Toon tabellen" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Ruimtegebruik" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Gebruik" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Effectief" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Rij-statistiek" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Opdrachten" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "statisch" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dynamisch" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Lengte van de rij" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Ruimtegebruik" @@ -8700,7 +8342,6 @@ msgid "Row length" msgstr "Lengte van de rij" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Grootte van de rij" @@ -8777,50 +8418,50 @@ msgstr "Geen" msgid "Column %s has been dropped" msgstr "Tabel %s is vervallen" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Een primaire sleutel is toegevoegd aan %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Een index is toegevoegd aan %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Relatieoverzicht" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Tabelstructuur voorstellen" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add column(s)" msgid "Add column" msgstr "Kolom(men) toevoegen" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Aan het eind van de tabel" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Aan het begin van de tabel" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Na %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Creëer een index op kolommen %s " -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "gepartitioneerd" @@ -8866,6 +8507,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "SQL-statements geëxporteerd. Kopiëer de dump of voer de dump uit." +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "Sluiten" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/pl.po b/po/pl.po old mode 100755 new mode 100644 index 8caaedd89..b871c10af --- a/po/pl.po +++ b/po/pl.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: polish \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Pokaż wszystko" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Szukaj" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Wykonaj" @@ -113,7 +93,7 @@ msgstr "Użyj tej wartości" msgid "Database %1$s has been created." msgstr "Baza danych %1$s została utworzona." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Komentarz bazy danych: " @@ -140,17 +120,10 @@ msgstr "Nazwy kolumn" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Typ" @@ -163,7 +136,7 @@ msgstr "Typ" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -187,24 +160,18 @@ msgstr "Łącze" msgid "Comments" msgstr "Komentarze" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Nie" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -213,15 +180,9 @@ msgstr "Nie" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -240,141 +201,133 @@ msgstr "Zrzut bazy danych" msgid "No tables found in database." msgstr "Nie znaleziono tabeli w bazie danych." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Zaznacz wszystkie" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Odznacz wszystkie" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Nazwa bazy danych jest pusta!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Baza danych %s ma nazwę zmienioną na %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Baza danych %s została skopiowana do %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Zmień nazwę bazy danych na" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Polecenie" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "a następnie" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Kopiuj bazę danych do" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Tylko struktura" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Struktura i dane" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Tylko dane" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREATE DATABASE przed skopiowaniem" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Dodaj %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Dodaj wartości AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Dodaj ograniczenia" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Przełącz do skopiowanej bazy danych" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "Repozytorium BLOBów" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Status" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "włączone" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Wyłącz" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Uszkodzone" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair" msgctxt "BLOB repository" msgid "Repair" msgstr "Napraw" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "wyłączone" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Włącz" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Metoda porównywania napisów" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -383,14 +336,14 @@ msgstr "" "Dodatkowe możliwości pracy z połączonymi tabelami zostały wyłączone. Aby " "dowiedzieć się, dlaczego - kliknij %stutaj%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Edytuj strony PDF" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -399,11 +352,7 @@ msgstr "Tabela" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Rekordów" @@ -411,42 +360,30 @@ msgstr "Rekordów" msgid "Size" msgstr "Rozmiar" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "w użyciu" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Utworzenie" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Ostatnia aktualizacja" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Ostatnie sprawdzenie" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -507,11 +444,7 @@ msgstr "Usuń" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "lub" @@ -545,85 +478,85 @@ msgstr "Użyj tabel" msgid "SQL query on database %s:" msgstr "Zapytanie SQL dla bazy danych %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Wykonaj zapytania" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Brak dostępu" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "przynajmniej jedno ze słów" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "wszystkie słowa" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "cała fraza" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "wyrażenie regularne" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Szukaj w rezultatach dla \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s trafień wewnątrz tabeli %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Przeglądaj" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Usuń" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "W sumie: %s trafień" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Szukaj w bazie danych" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Szukane słowa lub wartości (symbol wieloznaczny: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Znajdź:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Słowa są rozdzielane znakiem spacji (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Wewnątrz tabel(i):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -631,36 +564,36 @@ msgstr "Wewnątrz pola:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Dodaj" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Struktura" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Usuń" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Wyczyść" @@ -670,25 +603,25 @@ msgstr "Wyczyść" msgid "Table %s has been emptied" msgstr "Tabela %s została opróżniona" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Perspektywa %s została usunięta" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Tabela %s została usunięta" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -697,92 +630,86 @@ msgstr "" "Ta perspektywa ma przynajmniej tyle wierszy. Więcej informacji w %" "sdocumentation%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Perspektywa" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replikacja" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Suma" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s to domyślny mechanizm składowania tego serwera MySQL." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Zaznaczone:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Zaznacz wszystkie" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Odznacz wszystkie" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Zaznacz nieoptymalne" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Widok do druku" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Sprawdź tabelę" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optymalizuj tabelę" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Napraw tabelę" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analizuj tabelę" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Eksport" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Słownik danych" @@ -794,10 +721,10 @@ msgstr "Pomiń zablokowane tabele" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -819,8 +746,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Działanie" @@ -857,8 +784,8 @@ msgstr "Tylko struktura" msgid "Untracked tables" msgstr "Pomiń zablokowane tabele" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Sprawdź tabelę" @@ -942,7 +869,7 @@ msgstr "Zapamiętane zapytanie SQL zostało usunięte." msgid "Showing bookmark" msgstr "Pokaz zapamiętanego zapytania" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Zapytanie %s zostało zapamiętane" @@ -1028,295 +955,187 @@ msgstr "Brak nazwy hosta!" msgid "The user name is empty!" msgstr "Brak nazwy użytkownika!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Puste hasło!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Hasła nie są identyczne!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Dodaj nowego użytkownika" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Utwórz związek" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Przeładuj uprawnienia" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Usuń zaznaczonych użytkowników" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Anuluj" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Załaduj" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Procesy" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Zmień nazwę bazy danych na" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Baza danych" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Kopiuj bazę danych do" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Kodowanie napisów" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Tabela musi mieć przynajmniej jedno pole." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Utwórz tabelę" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Szukaj" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Modyfikacje zostały zapamiętane" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Usunięto powiązanie" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "Relacja FOREIGN KEY została dodana." -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Dodano wewnętrzne powiązanie" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Błąd: nie dodano związku." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Błąd: związek już istnieje." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Błąd podczas zapisywania współrzędnych dla Projektanta." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Ogólne funkcje relacyjne" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "wyłączone" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Wybierz klucz zewnętrzny" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Należy wybrać klucz główny lub klucz jednoznaczny" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Wybierz wyświetlane pole" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "Donate" msgid "Done" msgstr "Przekazanie darowizny" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Poprzednie" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Następne" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Sumarycznie" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr " Binarne " -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Mar" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Kwi" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Maj" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Cze" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Lip" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Sie" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Paź" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Sty" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Lut" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Kwi" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1324,178 +1143,178 @@ msgid "May" msgstr "Maj" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Cze" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Lip" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Sie" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Wrz" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Paź" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Lis" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Gru" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Nie" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Pon" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Wto" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Pią" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Nie" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Pon" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Wto" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Śro" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Czw" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Pią" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sob" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Nie" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Pon" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Wto" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Śro" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Czw" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Pią" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Sob" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "Wiki" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "w użyciu" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1556,7 +1375,7 @@ msgstr "Indeksy" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Jednoznaczny" @@ -1574,7 +1393,7 @@ msgid "Comment" msgstr "Komentarz" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1599,8 +1418,8 @@ msgstr "" "Indeksy %1$s i %2$s wyglądają na identyczne i jeden z nich mógłby zostać " "usunięty." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Bazy danych" @@ -1772,11 +1591,7 @@ msgstr "Hasło:" msgid "Server Choice" msgstr "Wybór serwera" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Odtąd musi być włączona obsługa ciasteczek." @@ -1857,11 +1672,7 @@ msgstr "" "Nie udało się użyć ani funkcji iconv, ani libiconv, mimo że rozszerzenia " "zgłaszają się jako załadowane. Proszę sprawdzić swoją konfigurację PHP." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Jeżeli otrzymasz " "pustą stronę, wszystko jest w porządku." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Nie udało się załadować domyślnej konfiguracji z pliku: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1899,49 +1702,29 @@ msgstr "" "Dyrektywa $cfg['PmaAbsoluteUri'] musi być ustawiona w pliku " "konfiguracyjnym!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Niewłaściwy numer serwera: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" "Niewłaściwa nazwa hosta serwera %1$s. Proszę przyjrzeć się konfiguracji." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Serwer" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "W konfiguracji ustawiono błędną metodę uwierzytelniania:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "W konfiguracji ustawiono błędną metodę uwierzytelniania:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Poleca się aktualizację do %s w wersji %s lub późniejszej." @@ -1969,7 +1752,7 @@ msgstr "Wysłane" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentacja" @@ -1983,138 +1766,138 @@ msgstr "Zapytanie SQL" msgid "MySQL said: " msgstr "MySQL zwrócił komunikat: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Wyjaśnij SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Pomiń wyjaśnienie SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "bez kodu PHP" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Utwórz kod PHP" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Odśwież" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Pomiń sprawdzanie poprawności SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Sprawdź poprawność SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Mechanizmy" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Profilowanie" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Czas" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "bajtów" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr " " #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d %B %Y, %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s dni, %s godzin, %s minut i %s sekund" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Początek" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Poprzednie" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Koniec" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Skok do bazy danych "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "Funkcja %s jest dotknięta przez znany błąd, zobacz %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2134,7 +1917,7 @@ msgid "Events" msgstr "Zdarzenia" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Nazwa" @@ -2162,15 +1945,15 @@ msgstr "Zapytanie przez przykład" msgid "Designer" msgstr "Projektant" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Import" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Uprawnienia" @@ -2189,11 +1972,7 @@ msgid "" msgstr "Być może w przybliżeniu. Zobacz FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Nadmiar" @@ -2213,7 +1992,7 @@ msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" "(lub gniazdo lokalnego serwera MySQL nie jest skonfigurowane poprawnie)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Szczegóły…" @@ -2223,36 +2002,22 @@ msgid "Change password" msgstr "Zmień hasło" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Brak hasła" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Hasło" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Ponownie" @@ -2267,20 +2032,12 @@ msgid "MySQL 4.0 compatible" msgstr "Kompatybilny z MySQL-em 4.0" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Generuj hasło" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Generuj" @@ -2293,17 +2050,23 @@ msgstr "Utwórz nową bazę danych" msgid "Create" msgstr "Utwórz" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Brak uprawnień" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Tabela musi mieć przynajmniej jedno pole." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Utwórz nową tabelę w bazie danych %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2368,11 +2131,7 @@ msgid "remember template" msgstr "pamiętaj szablon" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Kodowanie pliku:" @@ -2383,7 +2142,7 @@ msgstr "Typ kompresji" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Brak" @@ -2425,11 +2184,7 @@ msgstr "" msgid "File to import" msgstr "Plik do importu" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Lokalizacja pliku tekstowego" @@ -2437,20 +2192,12 @@ msgstr "Lokalizacja pliku tekstowego" msgid "File uploads are not allowed on this server." msgstr "Serwer nie pozwala na upload plików." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Katalog ustalony dla uploadu jest nieosiągalny" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "katalog serwera WWW dla uploadu" @@ -2588,11 +2335,7 @@ msgstr "Sortuj wg klucza" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Opcje" @@ -2663,14 +2406,14 @@ msgstr "Pokaż rekordy " msgid "total" msgstr "wszystkich" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Wykonanie zapytania trwało %01.4f sekund(y)" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Zmień" @@ -2739,11 +2482,7 @@ msgstr "Użycie rezerw buforowych" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Sumarycznie" @@ -3021,11 +2760,7 @@ msgstr "" "i dostają kolejny najwyższy numer." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Format" @@ -3097,13 +2832,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Dane" @@ -3152,15 +2882,9 @@ msgstr "Typ MIME" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Host" @@ -3362,7 +3086,7 @@ msgstr "Domyślne opcje eksportu" msgid "Open new phpMyAdmin window" msgstr "Otwórz nowe okno phpMyAdmina" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Brak tabel" @@ -3375,7 +3099,7 @@ msgstr "Rezultat SQL" msgid "Generated by" msgstr "Wygenerowany przez" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL zwrócił pusty wynik (zero rekordów)." @@ -3526,20 +3250,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Podstawowy" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Indeks" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Pełny tekst" @@ -3764,6 +3488,10 @@ msgstr "Ten format nie ma żadnych opcji" msgid "not OK" msgstr "błąd" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "włączone" @@ -3787,7 +3515,7 @@ msgstr "" "Informacje o tym, jak zaktualizować tabelę Column_comments znajdują się w " "dokumentacji" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Zapamiętane zapytanie SQL" @@ -3839,13 +3567,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Nazwa użytkownika" @@ -3865,22 +3588,14 @@ msgstr "Status serwera podrzędnego" msgid "Slave status" msgstr "Status serwera podrzędnego" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Zmienna" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Wartość" @@ -3898,40 +3613,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Dowolny użytkownik" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Użyj pola tekstowego" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Dowolny host" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Host lokalny" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Ten host" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Użyj tabeli hostów" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3955,7 +3641,6 @@ msgid "Use Host Table" msgstr "Użyj tabeli hostów" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3989,29 +3674,29 @@ msgstr "Nieznany język: %1$s." msgid "Servers" msgstr "Serwery" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Zmienne" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Kodowania napisów" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Mechanizmy" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Dziennik binarny" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Procesy" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -4041,51 +3726,51 @@ msgstr "" msgid "Target database" msgstr "Szukaj w bazie danych" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Uruchom zapytanie/zapytania SQL na serwerze %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Wykonanie zapytania/zapytań SQL do bazy danych %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Nazwy kolumn" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Pamiętaj zapytanie SQL" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Pozwól na dostęp wszystkim użytkownikom" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Zamień istniejące zapamiętane zapytanie o tej samej nazwie" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Nie nadpisuj tego zapytania spoza okna" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Separator" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Wywołaj ponownie zapytanie " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Wyślij" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Tylko pokaż" @@ -4264,13 +3949,13 @@ msgstr "Definicja partycji" msgid "Save" msgstr "Zachowaj" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "Dodaj %s pól" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4483,8 +4168,8 @@ msgstr "Resetuj" msgid "Protocol version" msgstr "Wersja protokołu" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Użytkownik" @@ -4931,115 +4616,115 @@ msgstr "Mechanizmy składowania" msgid "View dump (schema) of databases" msgstr "Zrzut baz danych" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Wszystkie uprawnienia, oprócz GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Pozwól zmieniać strukturę istniejących tabel." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Pozwól modyfikować i usuwać procedury składowane." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Pozwól tworzyć nowe bazy danych i tabele." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Pozwól tworzyć procedury składowane." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Pozwól tworzyć nowe tabele." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Pozwala tworzyć tabele tymczasowe." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Pozwól tworzyć, usuwać i zmieniać nazwy kont użytkowników." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Pozwól tworzyć perspektywy." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Pozwól usuwać dane." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Pozwól usuwać bazy danych i tabele." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Pozwól usuwać tabele." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Pozwól ustawiać zdarzenia w harmonogramie zdarzeń" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Pozwól wykonywać procedury składowane." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Pozwól importować i eksportować dane z/do plików." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Pozwól dodawać użytkowników i nadawać uprawnienia bez przeładowywania tabeli " "uprawnień." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Pozwól tworzyć i usuwać indeksy." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Pozwól dodawać i zamieniać dane." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Pozwól blokować tabele dla aktualnego wątku." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Ogranicz liczbę nowych połączeń, które może otworzyć użytkownik w ciągu " "godziny." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Ogranicz liczbę zapytań, które może wysłać użytkownik w ciągu godziny." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5047,60 +4732,60 @@ msgstr "" "Ogranicz liczbę poleceń zmieniających jakąkolwiek tabelę lub bazę danych, " "które może wykonać użytkownik w ciągu godziny." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Ogranicz liczbę jednoczesnych połączeń, które może użytkownik." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Pozwól oglądać procesy wszystkich użytkowyników" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Nie ma żadnych skutków w tej wersji MySQL." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Pozwól przeładowywać ustawienia serwera i opróżniać pamięć podręczną serwera." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" "Nadaj użytkownikowi prawo, by zapytać gdzie są serwery podrzędne / nadrzędne." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Potrzebne dla replikacji serwera podrzędnego." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Pozwól czytać dane." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Daj dostęp do pełnej listy baz danych." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Pozwól wykonywać zapytania SHOW CREATE VIEW." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Pozwól wyłączyć serwer." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5110,157 +4795,157 @@ msgstr "" "połączeń; Wymagane dla większość operacji administracyjnych, takich jak " "ustawianie zmiennych globalnych czy unicestwianie wątków innych użytkowników." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Pozwól tworzyć i usuwać wyzwalacze." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Pozwól zmieniać dane." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Brak uprawnień." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Brak" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Uprawnienia specyficzne dla tabel" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Uwaga: Uprawnienia MySQL są oznaczone w języku angielskim " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Globalne uprawnienia" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Uprawnienia specyficzne dla baz danych" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administracja" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Ograniczenia zasobów" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Uwaga: Ustawienie tych opcji na 0 (zero) usuwa ograniczenie." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Dane użytkownika" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Nie zmieniaj hasła" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Nie znaleziono użytkownika(ów)." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Użytkownik %s już istnieje!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Nowy użytkownik został dodany." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Uaktualniłeś uprawnienia dla %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Uprawnienia dla %s zostały cofnięte" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Hasło dla %s zostało pomyślnie zmienione." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Usuwanie %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Żaden użytkownik ze został zaznaczony do usunięcia!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Przeładuj uprawnienia" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Wybrani użytkownicy zostali pomyślnie usunięci." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Uprawnienia zostały pomyślnie przeładowane." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Edytuj uprawnienia" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Cofnij" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Opis użytkownika" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Nadawanie" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Dowolny" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Dodaj nowego użytkownika" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Usuń zaznaczonych użytkowników" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Cofnij wszystkie aktywne uprawnienia użytkownikom, a następnie usuń ich." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Usuń bazy danych o takich samych nazwach jak użytkownicy." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5273,96 +4958,96 @@ msgstr "" "może się różnić od uprawnień jakich faktycznie używa serwer. W takim " "przypadku powinieneś przed dalszą pracą %sprzeładować uprawnienia%s." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Wybrany użytkownik nie został znaleziony w tabeli uprawnień." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Uprawnienia specyficzne dla kolumn" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Dodaj uprawnienia dla następującej bazy danych" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Aby użyć symboli wieloznacznych _ i % w znaczeniu dosłownym, należy je " "poprzedzić znakiem \\ " -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Dodaj uprawnienia dla następującej tabeli" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Zmień dane użytkownika / Skopiuj użytkownika" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Utwórz nowego użytkownika z takimi samymi uprawnieniami i …" -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "… pozostaw starego." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " … usuń starego z tabel użytkowników." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " … odbierz wszystkie aktywne uprawnienia staremu, a następnie go usuń." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" " … usuń starego z tabel użytkowników, a następnie przeładuj uprawnienia." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Baza danych dla użytkownika" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Brak" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Utwórz bazę danych z taką samą nazwą i przyznaj wszystkie uprawnienia" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" "Przyznaj wszystkie uprawienia do baz danych o nazwach pasujących do maski " "(nazwaużytkownika_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "Sprawdź uprawnienia bazy danych "%s"." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Użytkownicy mający dostęp do "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "globalnie" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "specyficzne dla bazy danych" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "znak wieloznaczny" @@ -8215,25 +7900,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "Identyfikator wstawionego rekordu: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Wyświetlany jest kod PHP." -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Wyświetlane jest zapytanie SQL." -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Problemy z indeksami tabeli `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Nazwa" @@ -8286,13 +7971,6 @@ msgstr "" msgid "Show insert query" msgstr "Wyświetlane jest zapytanie SQL." -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "a następnie" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Wróć" @@ -8374,7 +8052,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Dodaj  %s kolumn do indeksu " -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Liczba kolumn musi być większa niż zero." @@ -8488,41 +8166,6 @@ msgstr "Sprawdź spójność powiązań:" msgid "Show tables" msgstr "Pokaż tabele" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Wykorzystanie przestrzeni" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Wykorzystanie" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Efektywne" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Statystyka rekordów" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Cecha" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "zmienny" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Długość rekordu" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Wykorzystanie przestrzeni" @@ -8556,7 +8199,6 @@ msgid "Row length" msgstr "Długość rekordu" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Rozmiar rekordu " @@ -8631,50 +8273,50 @@ msgstr "Brak" msgid "Column %s has been dropped" msgstr "Tabela %s została usunięta" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Do %s dodany został klucz podstawowy" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Do %s dodany został indeks" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Widok relacyjny" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Analiza zawartości" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "Dodaj %s pól" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Na końcu tabeli" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Na początku tabeli" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Po %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Utwórz indeks dla %s kolumn" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "partycjonowanie" @@ -8716,6 +8358,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -9130,6 +8776,9 @@ msgstr "Zmień nazwę tabeli na" #~ msgid "Process list" #~ msgstr "Lista procesów" +#~ msgid "Reload privileges" +#~ msgstr "Przeładuj uprawnienia" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/pt.po b/po/pt.po old mode 100755 new mode 100644 index 07e24b916..fde64802c --- a/po/pt.po +++ b/po/pt.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: portuguese \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Mostrar tudo" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -38,53 +34,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Pesquisar" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Executa" @@ -110,7 +90,7 @@ msgstr "Usar este valor" msgid "Database %1$s has been created." msgstr "A base de dados %s foi eliminada." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Comentário da Base de Dados: " @@ -137,17 +117,10 @@ msgstr "Nome dos Campos" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Tipo" @@ -160,7 +133,7 @@ msgstr "Tipo" msgid "Null" msgstr "Nulo" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -184,24 +157,18 @@ msgstr "Links para" msgid "Comments" msgstr "Comentários" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Não" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -210,15 +177,9 @@ msgstr "Não" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -237,147 +198,139 @@ msgstr "Ver o esquema da base de dados" msgid "No tables found in database." msgstr "Nenhuma tabela encontrada na base de dados" -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Selecciona Todas" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Limpa Todas as Selecções" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 #, fuzzy msgid "The database name is empty!" msgstr "O nome da tabela está vazio!" -#: db_operations.php:241 +#: db_operations.php:236 #, fuzzy, php-format msgid "Database %s has been renamed to %s" msgstr "Tabela %s renomeada para %s" -#: db_operations.php:245 +#: db_operations.php:240 #, fuzzy, php-format msgid "Database %s has been copied to %s" msgstr "Tabela %s copiada para %s." -#: db_operations.php:423 +#: db_operations.php:412 #, fuzzy msgid "Rename database to" msgstr "Renomeia a tabela para " -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Comando" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "" #: db_operations.php:455 ->>>>>>> origin/master #, fuzzy msgid "Copy database to" msgstr "Sem bases de dados" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Somente estrutura" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Estrutura e dados" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Apenas dados" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Adicionar valor AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Adicionar limitadores" -#: db_operations.php:507 +#: db_operations.php:496 #, fuzzy msgid "Switch to copied database" msgstr "Mudar para a tabela copiada" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Estado" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Activado" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "Desactidado" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "Reparar tabela" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Desactidado" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "Activado" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master #, fuzzy msgid "Collation" msgstr "Criação" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -386,14 +339,14 @@ msgstr "" "As Características adicionais para trabalhar com ligações entre Tabelas " "foram desactivadas. Para saber porquê carregue %saqui%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Editar páginas PDF" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -402,11 +355,7 @@ msgstr "Tabela" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Registos" @@ -414,42 +363,30 @@ msgstr "Registos" msgid "Size" msgstr "Tamanho" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "em uso" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Criação" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Actualização" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Verificação" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -510,11 +447,7 @@ msgstr "Elim." #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Ou" @@ -548,85 +481,85 @@ msgstr "Usar Tabelas" msgid "SQL query on database %s:" msgstr "Comando SQL na base de dados %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Executa Comando SQL" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Acesso Negado" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "pelo menos uma das palavras" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "todas as palavras" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "a frase exacta" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "as regular expression" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Procurar resultados para \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s resultado(s) na tabela %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Visualiza" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Apagar" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Total: %s resultado(s)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Pesquisar na Base de Dados" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Palavra(s) ou valor(es) para pesquisar para (wildcard: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Procurar:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "As palavras são separadas pelo caracter espaço (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Dentro de Tabela(s):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -634,36 +567,36 @@ msgstr "Dentro de Tabela(s):" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Insere" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Estrutura" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Elimina" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Limpa" @@ -673,118 +606,112 @@ msgstr "Limpa" msgid "Table %s has been emptied" msgstr "A tabela %s foi limpa" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, fuzzy, php-format msgid "View %s has been dropped" msgstr "O campo %s foi eliminado" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "A tabela %s foi eliminada" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 #, fuzzy msgid "Replication" msgstr "Relações" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Soma" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "" -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Com os seleccionados:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Todos" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Nenhum" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Vista de impressão" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Verificar tabela" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimizar tabela" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Reparar tabela" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analizar tabela" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Exportar" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Dicionario de dados" @@ -796,10 +723,10 @@ msgstr "Verificar tabela" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -821,8 +748,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Acções" @@ -859,8 +786,8 @@ msgstr "Somente estrutura" msgid "Untracked tables" msgstr "Verificar tabela" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Verificar tabela" @@ -937,7 +864,7 @@ msgstr "Marcador apagado com sucesso." msgid "Showing bookmark" msgstr "" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "" @@ -1018,292 +945,189 @@ msgstr "O nome da máquina está vazio!" msgid "The user name is empty!" msgstr "O nome do utilizador está vazio!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Indique a palavras-passe!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "" "As palavras-passe são diferentes!\\nLembre-se de confirmar a palavra-passe!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Acrescenta um utilizador" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Versão do servidor" - -#: js/messages.php:48 -#, fuzzy -msgid "Reloading Privileges" -msgstr "Privilégios Globais" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Remover utilizadores seleccionados" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Local" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Processos" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -msgid "Renaming Databases" -msgstr "Renomeia a tabela para " - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Base de Dados" - -#: js/messages.php:67 -#, fuzzy -msgid "Copying Database" -msgstr "Sem bases de dados" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Mapa de Caractere" - -#: js/messages.php:69 -#, fuzzy -#| msgid "You have to choose at least one column to display" -msgid "Table must have atleast 1 column" -msgstr "Tem que escolher pelo menos uma coluna para mostrar" - -#: js/messages.php:70 -#, fuzzy -msgid "Create Table" -msgstr "Criar uma Página nova" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Pesquisar" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Modificações foram guardadas" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 #, fuzzy msgid "Relation deleted" msgstr "Vista de Relação" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 #, fuzzy msgid "Internal relation added" msgstr "Relações internas" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Características gerais de Relação" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Desactidado" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Escolha campo para mostrar" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy msgid "Done" msgstr "Dados" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Anterior" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Próximo" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Total" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr " Binário " -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Mar" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Abr" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Mai" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Jun" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Jul" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Ago" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Out" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Jan" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Fev" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Abr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1311,176 +1135,176 @@ msgid "May" msgstr "Mai" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Jun" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Jul" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Ago" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Set" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Out" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Nov" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Dez" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Dom" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Seg" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Ter" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Sex" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Dom" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Seg" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Ter" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Qua" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Qui" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Sex" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sab" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Dom" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Seg" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Ter" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Qua" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Qui" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Sex" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Sab" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "em uso" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1537,7 +1361,7 @@ msgstr "Índices" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Único" @@ -1556,7 +1380,7 @@ msgid "Comment" msgstr "Comentários" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1579,8 +1403,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Base de Dados" @@ -1746,11 +1570,7 @@ msgstr "Palavra-passe :" msgid "Server Choice" msgstr "Escolha do Servidor" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "O mecanismo de \"Cookies\" tem de estar ligado a partir deste ponto." @@ -1832,11 +1652,7 @@ msgstr "" "recode_string enquanto a extensão reportar que está ligada. Confira a " "configuração do seu php." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Se receber uma página em branco, está tudo correcto." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1873,47 +1681,27 @@ msgstr "" "A directiva $cfg['PmaAbsoluteUri'] TEM que ser definida no ficheiro " "de configuração!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Servidor" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "deve actualizar para %s %s ou mais recente." @@ -1941,7 +1729,7 @@ msgstr "pt" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Documentação" @@ -1955,136 +1743,136 @@ msgstr "Comando SQL" msgid "MySQL said: " msgstr "Mensagens do MySQL : " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Explicar SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Saltar Explicar SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "sem código PHP" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Criar código PHP" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Saltar a validação SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Validar SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Tempo" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Bytes" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d-%B-%Y às %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s dias, %s horas, %s minutos e %s segundos" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Inicio" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Anterior" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Fim" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Saltar para a Base de Dados "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2106,7 +1894,7 @@ msgid "Events" msgstr "Enviado" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Nome" @@ -2134,16 +1922,16 @@ msgstr "Pesquisa por formulário" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 #, fuzzy msgid "Import" msgstr "Exportar" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privilégios" @@ -2162,11 +1950,7 @@ msgid "" msgstr "" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Suspenso" @@ -2183,7 +1967,7 @@ msgstr "" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2193,36 +1977,22 @@ msgid "Change password" msgstr "Alterar a palavra-passe" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Sem palavra-passe" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Palavra-passe" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Confirma" @@ -2235,20 +2005,12 @@ msgid "MySQL 4.0 compatible" msgstr "" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master #, fuzzy msgid "Generate" msgstr "Gerado por" @@ -2262,17 +2024,23 @@ msgstr "Criar nova base de dados" msgid "Create" msgstr "Criar" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Sem Privilégios" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "You have to choose at least one column to display" +msgid "Table must have at least one column." +msgstr "Tem que escolher pelo menos uma coluna para mostrar" + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Criar nova tabela na base de dados %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of rows per page" msgid "Number of columns" @@ -2336,11 +2104,7 @@ msgid "remember template" msgstr "Lembrar-se do modelo" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Configurar o Mapa de Caracteres do ficheiro:" @@ -2351,7 +2115,7 @@ msgstr "Compressão" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Nenhum" @@ -2393,11 +2157,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Localização do arquivo de texto" @@ -2405,20 +2165,12 @@ msgstr "Localização do arquivo de texto" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Não é possivel alcançar a directoria que configurou para fazer upload" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "Directoria no servidor web para fazer upload" @@ -2547,11 +2299,7 @@ msgstr "Ordenar por chave" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "Operações" @@ -2623,14 +2371,14 @@ msgstr "Mostrando registos " msgid "total" msgstr "total" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "O Query demorou %01.4f sec" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Muda" @@ -2698,11 +2446,7 @@ msgstr "" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Total" @@ -2948,11 +2692,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Formato" @@ -3024,13 +2764,8 @@ msgstr "" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Dados" @@ -3079,15 +2814,9 @@ msgstr "MIME-type" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Máquina" @@ -3293,7 +3022,7 @@ msgstr "Tipo de Exportação" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Sem tablelas" @@ -3306,7 +3035,7 @@ msgstr "Resultado SQL" msgid "Generated by" msgstr "Gerado por" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL não retornou nenhum registo." @@ -3454,20 +3183,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primária" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Índice" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Texto Completo" @@ -3696,6 +3425,10 @@ msgstr "Este formato não tem opções" msgid "not OK" msgstr "não está OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Activado" @@ -3718,7 +3451,7 @@ msgid "" msgstr "" "Consulte a Documentação sobre como actualizar a Tabela Column_comments Table" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Comandos SQL marcados" @@ -3769,13 +3502,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Nome do Utilizador" @@ -3793,22 +3521,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Variável" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Valor" @@ -3827,40 +3547,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Qualquer utilizador" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Usar campo de texto" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Qualquer máquina" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Local" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Este Anfitrião" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Usar a tabela do anfitrião" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3884,7 +3575,6 @@ msgid "Use Host Table" msgstr "Usar a tabela do anfitrião" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3919,30 +3609,30 @@ msgstr "" msgid "Servers" msgstr "Servidor" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Variáveis" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Mapas de Caracteres" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 #, fuzzy msgid "Binary log" msgstr " Binário " -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Processos" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3971,51 +3661,51 @@ msgstr "" msgid "Target database" msgstr "Pesquisar na Base de Dados" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, fuzzy, php-format msgid "Run SQL query/queries on server %s" msgstr "Executa comando(s) SQL na base de dados %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Executa comando(s) SQL na base de dados %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Nome dos Campos" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Marcar este comando SQL" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Deixar todos os utilizadores acederem a este marcador" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Não alterar esta pesquisa de fora da janela" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Mostrar de novo aqui este comando " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Submete" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Ver apenas" @@ -4190,12 +3880,12 @@ msgstr "" msgid "Save" msgstr "Guarda" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format msgid "Add %s column(s)" msgstr "Adiciona novo campo" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to add at least one column." @@ -4337,8 +4027,8 @@ msgstr "Limpa" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Utilizador" @@ -4776,117 +4466,117 @@ msgstr "" msgid "View dump (schema) of databases" msgstr "Ver o esquema da base de dados" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "inclui todos os privilégios excepto Conceção - GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Permite alterar a estrutura de tabelas existentes." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 #, fuzzy msgid "Allows altering and dropping stored routines." msgstr "Permite criar e apagar indexes." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Permite criar novas Bases de Dados e tabelas." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 #, fuzzy msgid "Allows creating stored routines." msgstr "Permite criar novas tabelas." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Permite criar novas tabelas." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Permite criar tabelas temporárias." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 #, fuzzy msgid "Allows creating new views." msgstr "Permite criar novas tabelas." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Permite apagar dados." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Permite apagar Bases de Dados e tabelas." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Permite apagar Bases de Dados." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 #, fuzzy msgid "Allows executing stored routines." msgstr "Permite criar novas tabelas." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Permite importar dados de... e exportar dados para ficheiros." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Permite adicionar utilizadores e privilégios sem recarregar a tabela de " "privilégios." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Permite criar e apagar indexes." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Permite inserir e substituir dados." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "" -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Limits the number of new connections the user may open per hour." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Limits the number of queries the user may send to the server per hour." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4894,217 +4584,217 @@ msgstr "" "Limits the number of commands that change any table or database the user may " "execute per hour." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 #, fuzzy msgid "Limits the number of simultaneous connections the user may have." msgstr "Limits the number of new connections the user may open per hour." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Não tem efeito nesta versão do MySQL." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "" -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Permite ler dados." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Dá acesso à lista de bases de dados completa." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Permite desligar o servidor." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " "killing threads of other users." msgstr "" -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "Permite criar e apagar indexes." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Permite alterar dados." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Sem privilégios." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Nenhum" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Privilégios específicos da tabela" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Nota: os nomes dos privilégios do MySQL são em Inglês " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Privilégios Globais" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Privilégios específicos da Base de Dados" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administração" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Limites do recurso" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Nota: Configurar estas opções para 0 (zero) remove o limite." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Informação de Login " -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Mantendo a palavra-passe " -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Nenhum utilizador encontrado." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "O utilizador %s já existe!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Acrescentou um novo utilizador." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Actualizou os privilégios de %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Anulou os privilégios para %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "A palavra-passe para %s foi alterada com sucesso." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "A apagar %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "A recarregar privilégios" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Os utilizadores selecionado foram apagados com sucesso." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "O privilégios foram recarregados com sucesso." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Alterar Privilegios" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Anula" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Conceder/Grant" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Todos" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Acrescenta um utilizador" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Remover utilizadores seleccionados" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Revogar todos os privilégios dos utilizadores e apagá-los a seguir." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "" "Apagar as Bases de Dados que tenham os mesmos nomes que os utilizadores." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5117,49 +4807,49 @@ msgstr "" "privilégios que o servidor usa se alterações manuais nele forem feitas. " "Neste caso, deve %sreload the privileges%s antes de continuar." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "O utilizador selecionado não se encontra na tabela de privilégios." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Privilégios específicos da Coluna" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Adicionar privilégios na base de dados seguinte" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Todos privilégios na tabela seguinte" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Mudar a informação de login / Copiar Utilizador" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Criar um novo utilizador com os mesmo privilégios e ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... manter o antigo." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... apagar o antigo das tabelas do utilizador." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... revogar todos os privilégios activos do antigo e a seguir apagá-lo." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5167,44 +4857,44 @@ msgstr "" " ... apagar o antigo das tabelas do utilizador e depois recarregue os " "privilégios." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Nenhum" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "Verificar Privilégios para a Base de Dados "%s"." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Utilizadores que tem acesso a "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "global" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "Especifico da Base de Dados" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "" @@ -7839,26 +7529,26 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 #, fuzzy msgid "Showing SQL query" msgstr "Mostrar queries completos" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Etiqueta" @@ -7910,13 +7600,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Voltar atrás" @@ -7998,7 +7681,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Adicionar ao índice  %s coluna(s)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -8115,41 +7798,6 @@ msgstr "Verificar Integridade referencial:" msgid "Show tables" msgstr "Mostra tabelas" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Espaço ocupado" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Utilização" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Em uso" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Estatísticas dos registos" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Itens" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinâmico" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Comprim. dos reg." - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Espaço ocupado" @@ -8183,7 +7831,6 @@ msgid "Row length" msgstr "Comprim. dos reg." #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Tamanho dos reg." @@ -8256,49 +7903,49 @@ msgstr "Nenhum" msgid "Column %s has been dropped" msgstr "A tabela %s foi eliminada" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Uma chave primária foi adicionada a %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Um índice foi adicionado a %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Vista de Relação" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Propor uma estrutura de tabela" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy msgid "Add column" msgstr "Adiciona novo campo" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "No Fim da Tabela" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "No Início da Tabela" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Depois %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Criar um índice com %s coluna(s)" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8340,6 +7987,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8684,6 +8335,10 @@ msgstr "Renomeia a tabela para " #~ msgid "Process list" #~ msgstr "Lista de Processos" +#, fuzzy +#~ msgid "Reload privileges" +#~ msgstr "Privilégios Globais" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/pt_BR.po b/po/pt_BR.po old mode 100755 new mode 100644 index 35ee98e68..fcca008b4 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-21 05:17+0200\n" "Last-Translator: Maurício Meneghini Fauth \n" "Language-Team: brazilian_portuguese \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Mostrar todos" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Procurar" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Executar" @@ -114,7 +94,7 @@ msgstr "Usar este valor" msgid "Database %1$s has been created." msgstr "Banco de dados %1$s foi criado." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Comentário do Banco de Dados: " @@ -141,17 +121,10 @@ msgstr "Nome das colunas" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Tipo" @@ -164,7 +137,7 @@ msgstr "Tipo" msgid "Null" msgstr "Nulo" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -188,24 +161,18 @@ msgstr "Links para" msgid "Comments" msgstr "Comentários" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Não" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -214,15 +181,9 @@ msgstr "Não" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -241,141 +202,133 @@ msgstr "Ver o esquema do Banco de Dados" msgid "No tables found in database." msgstr "Nenhuma tabela encontrada no Banco de Dados" -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Selecionar Todos" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Desmarcar Todos" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "O nome do Banco de Dados está em branco!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "O Banco de Dados %s foi renomeado para %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Banco de Dados %s copiado para %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Renomear Banco de Dados para" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Comando" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "e então" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Copiar Banco de Dados para" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Somente estrutura" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Estrutura e dados" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Dados apenas" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREATE DATABASE antes de copiar" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Adicionar %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Adicionar valor AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Adicionar restrições" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Mudar para o Banco de Dados copiado" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Status" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Habilitado" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Desabilitar" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair" msgctxt "BLOB repository" msgid "Repair" msgstr "Reparar" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Desabilitado" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Habilitar" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Collation" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -384,14 +337,14 @@ msgstr "" "Os recursos adicionais para trabalhar com tabelas linkadas foram " "desativadas. Para descobrir o motivo clique %saqui%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Editar Páginas PDF" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -400,11 +353,7 @@ msgstr "Tabela" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Registros" @@ -412,42 +361,30 @@ msgstr "Registros" msgid "Size" msgstr "Tamanho" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "em uso" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Criação" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Última atualização" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Última verificação" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -508,11 +445,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Ou" @@ -546,85 +479,85 @@ msgstr "Usar tabelas" msgid "SQL query on database %s:" msgstr "Consulta no Banco de Dados %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Enviar consulta SQL" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Acesso negado" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "pelo menos uma das palavras" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "todas as palavras" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "a frase exata" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "como expressão regular" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Procurar resultados por \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s resultado(s) dentro da tabela %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Visualizar" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Remover" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Total: %s resultado(s)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Procurar no Banco de Dados" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Palavra(s) ou valor(es) para procurar (coringa: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Encontrar:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Palavras são separadas por um caracter de espaço (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Dentro da(s) tabela(s):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -632,36 +565,36 @@ msgstr "Dentro do campo:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Inserir" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Estrutura" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Eliminar" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Limpar" @@ -671,117 +604,111 @@ msgstr "Limpar" msgid "Table %s has been emptied" msgstr "Tabela %s foi esvaziada" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Visão %s foi apagada" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Tabela %s foi eliminada" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Visão" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replicação" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Soma" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s é o stored engine padrão neste servidor MySQL." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Com marcados:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Marcar todos" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Desmarcar todos" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Verificar sobre-carga" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Visualização para impressão" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Verificar tabela" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Otimizar tabela" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Reparar tabela" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analizar tabela" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Exportar" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Dicionário de dados" @@ -793,10 +720,10 @@ msgstr "Verificar tabela" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -818,8 +745,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Ação" @@ -856,8 +783,8 @@ msgstr "Somente estrutura" msgid "Untracked tables" msgstr "Verificar tabela" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Verificar tabela" @@ -942,7 +869,7 @@ msgstr "O marcador foi removido." msgid "Showing bookmark" msgstr "Exibindo marcadores" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Marcador %s criado" @@ -1027,293 +954,186 @@ msgstr "O nome do servidor está vazio!" msgid "The user name is empty!" msgstr "O nome do usuário está em branco!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "A senhas está em branco!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "As senhas não são iguais!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Adicionar novo usuário" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Criar relacionamento" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Recarregar privilégios" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Remover os usuários selecionados" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Cancelar" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Local" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Processos" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Renomear Banco de Dados para" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Banco de Dados" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Copiar Banco de Dados para" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Conjunto de caracteres" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Tabela deve ter pelo menos um campo." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Criar tabela" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Procurar" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Modificações foram salvas" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Relacionamento apagado" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Adicionado relacionamento Interno" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Erro: relacionamento não adicionado." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Erro: relacionamento já existe." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Erro ao salvar coordenada para o Designer." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Recursos de relações gerais" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Desabilitado" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Seleciona chave referenciada" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Selecionar Chave Estrangeira" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Por favor, selecione uma chave primária ou uma chave única" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Escolha o campo para exibir" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy msgid "Done" msgstr "Dados" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Anterior" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Próximo" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Total" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr " Binário " -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Mar" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Abr" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Mai" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Jun" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Jul" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Ago" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Out" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Jan" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Fev" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Abr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1321,176 +1141,176 @@ msgid "May" msgstr "Mai" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Jun" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Jul" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Ago" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Set" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Out" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Nov" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Dez" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Dom" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Seg" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Ter" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Sex" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Dom" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Seg" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Ter" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Qua" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Qui" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Sex" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sab" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Dom" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Seg" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Ter" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Qua" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Qui" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Sex" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Sab" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "em uso" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1551,7 +1371,7 @@ msgstr "Índices" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Único" @@ -1569,7 +1389,7 @@ msgid "Comment" msgstr "Cometário" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1594,8 +1414,8 @@ msgstr "" "A indexação %1$s e %2$s parecem ser iguais ou uma delas pode ter sido " "removida." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Banco de Dados" @@ -1768,11 +1588,7 @@ msgstr "Senha:" msgid "Server Choice" msgstr "Seleção do Servidor" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Cookies devem estar ativos após este ponto." @@ -1854,11 +1670,7 @@ msgstr "" "recode_string enquanto a extensão reportar que está ligada. Confira a " "configuração do seu php." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Se receber uma página em branco, está tudo certo." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Não foi possível carregar configuração padrão de: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" msgstr "A variável $cfg['PmaAbsoluteUri'] deve ser setada" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Índice de servidor inválido: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" "Nome de serivdor inválido para o servidor %1$s. Verifique suas configurações." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Servidor" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Método de autenticação inválido informado nas configurações:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Método de autenticação inválido informado nas configurações:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Você deveria atualizar para %s %s ou posterior." @@ -1962,7 +1746,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Documentação" @@ -1976,138 +1760,138 @@ msgstr "consulta SQL" msgid "MySQL said: " msgstr "Mensagens do MySQL : " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Explicar SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Pular Explicação SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "sem código PHP" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Criar código PHP" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Atualizar" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Pular validação SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Validar SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Engines" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Perfil" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Tempo" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Bytes" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d/%m/%Y às %Hh%Mmin" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s dias, %s horas, %s minutos e %s segundos" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Início" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Anterior" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Fim" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Ir para o Banco de Dados "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "A funcionalidade %s é afetada por um bug conhecido, veja %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2126,7 +1910,7 @@ msgid "Events" msgstr "Eventos" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Nome" @@ -2154,15 +1938,15 @@ msgstr "Procurar por exemplo" msgid "Designer" msgstr "Designer" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Importar" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privilégios" @@ -2181,11 +1965,7 @@ msgid "" msgstr "Pode ser aproximado. Veja o FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Sobrecarga" @@ -2204,7 +1984,7 @@ msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" "(ou o soquete do servidor MySQL local não está configurado corretamente)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Detalhes..." @@ -2214,36 +1994,22 @@ msgid "Change password" msgstr "Alterar a senha" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Sem senha" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Senha" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Re-digite" @@ -2258,20 +2024,12 @@ msgid "MySQL 4.0 compatible" msgstr "Compatível com MySQL 4.0" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Gerar Senha" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Gerar" @@ -2284,17 +2042,23 @@ msgstr "Criar novo Banco de Dados" msgid "Create" msgstr "Criar" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Sem privilégios" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Tabela deve ter pelo menos um campo." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Criar nova tabela no Banco de Dados %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2359,11 +2123,7 @@ msgid "remember template" msgstr "lembrar modelo" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Conjunto de caracteres do arquivo" @@ -2374,7 +2134,7 @@ msgstr "Compressão" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Nenhum" @@ -2416,11 +2176,7 @@ msgstr "" msgid "File to import" msgstr "Arquivo para importar" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Localização do arquivo texto" @@ -2428,21 +2184,13 @@ msgstr "Localização do arquivo texto" msgid "File uploads are not allowed on this server." msgstr "Não é permitido subir arquivos neste servidor." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "" "O diretório que você especificou para subir arquivos não foi encontrado." -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "Servidor web subiu o diretório" @@ -2578,11 +2326,7 @@ msgstr "Ordenar pela chave" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Opções" @@ -2652,14 +2396,14 @@ msgstr "Mostrando registros " msgid "total" msgstr "total" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Consulta levou %01.4f segundos" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Alterar" @@ -2731,11 +2475,7 @@ msgstr "Uso do Buffer Pool" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Total" @@ -2997,11 +2737,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Formato" @@ -3073,13 +2809,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Dados" @@ -3128,15 +2859,9 @@ msgstr "MIME-type" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Servidor" @@ -3335,7 +3060,7 @@ msgstr "Tipo de exportação" msgid "Open new phpMyAdmin window" msgstr "Abrir nova janela do phpMyAdmin" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "Nova tabela" @@ -3347,7 +3072,7 @@ msgstr "Resultado SQL" msgid "Generated by" msgstr "Gerado por" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL retornou um conjunto vazio (ex. zero registros)." @@ -3497,20 +3222,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primária" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Índice" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Texto completo" @@ -3735,6 +3460,10 @@ msgstr "Esse formato não tem opções" msgid "not OK" msgstr "não está OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Habilitado" @@ -3757,7 +3486,7 @@ msgid "" msgstr "" "Consulte a documentação sobre como atualizar sua tabela Column_comments" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Consulta SQL gravada" @@ -3808,13 +3537,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Nome do usuário" @@ -3833,22 +3557,14 @@ msgstr "Exibir status dos escravos" msgid "Slave status" msgstr "Exibir status dos escravos" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Variáveis" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Valor" @@ -3866,40 +3582,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Qualquer usuário" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Usar campo texto" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Qualquer servidor" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Local" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Esse Servidor" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Usar Tabela do Servidor" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3923,7 +3610,6 @@ msgid "Use Host Table" msgstr "Usar Tabela do Servidor" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3957,29 +3643,29 @@ msgstr "Linguagem desconhecida: %1$s." msgid "Servers" msgstr "Servidores" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Variáveis" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Conjuntos de caracteres" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Engines" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Log binário" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Processos" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -4008,51 +3694,51 @@ msgstr "" msgid "Target database" msgstr "Procurar no Banco de Dados" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Rodar consulta(s) SQL no servidor %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Fazer consulta SQL no Banco de Dados %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Nome das colunas" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Gravar essa consulta SQL" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Deixar qualquer usuário acessar esse marcador" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Substituir marcador de mesmo nome existente" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Não sobrescrever esta consulta fora desta janela" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Delimitadores" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Mostrar esta consulta SQL novamente " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Submeter" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Apenas visualizar" @@ -4230,13 +3916,13 @@ msgstr "Definição da PARTIÇÃO" msgid "Save" msgstr "Salvar" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "Adicionar %s campo(s)" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4449,8 +4135,8 @@ msgstr "Restaurar" msgid "Protocol version" msgstr "Versão do Protocolo" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Usuário" @@ -4900,114 +4586,114 @@ msgstr "Storage Engines" msgid "View dump (schema) of databases" msgstr "Ver dump (esquema) dos Bancos de Dados" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Incluir todos os privilégios, exceto GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Permitir alterar a estrutura das tabelas existentes." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Permitir alterar e apagar stored routines." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Permitir criar novas tabelas e Banco de Dados." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Permitir criar stored routines." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Permitir criar novas tabelas." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Permitir criar tabelas temporárias." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Permitir criar, apagar e renomear contas dos usuários." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Permitir criar novas visões." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Permitir apagar dados." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Permitir eliminar Banco de Dados e tabelas." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Permitir eliminar tabelas." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Permitir iniciar eventos no cronograma de eventos" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Permitir executar stored routines." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Permitir importar dados e exportar dados em arquivos." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Permitir adicionar usuários e privilégios sem recarregar a tabela de " "privilégios." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Permitir criar e eliminar índices." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Permitir inserir e substituir dados." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Permitir bloquear tabelas para a processo atual." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Limitar o numero de novas conexões que o usuário pode abrir por hora." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Limitar o número de consultas que podem ser enviadas ao servidor por hora." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5015,60 +4701,60 @@ msgstr "" "Limitar o número de comandos que alteram Bancos de Dados ou tabelas que o " "usuário pode executar por hora." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Limitar o número de conexões simultâneas que o usuário pode ter." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Permitir visualizar processos de todos os usuários" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Sem efeitos nesta versão do MySQL." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Permitir recarregar configurações do servidor e descarregar o cache do " "servidor." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Permitir que o usuário pergunte onde estão os escravos / mestres." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Precisar dos escravos de replicação." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Permitir leitura dos dados." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Permitir acesso completo à lista de Bancos de Dados." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Permitir executar consultas SHOW CREATE VIEW." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Permitir desligar o servidor." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5078,156 +4764,156 @@ msgstr "" "para muitas operações administrativas, como setar variáveis globais e matar " "processos de outros usuários." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Permitir criar e e largar em cadeia" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Permitir modificar dados." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Sem privilégios." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Nenhum" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Privilégios específicos da tabela" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Nota: nomes de privilégios do MySQL são expressos em inglês " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Privilégios globais" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Privilégios específicos do Banco de Dados" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administração" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Limite dos recursos" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Nota: Ajustar essa opção para 0 (zero) remove os limites." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Informação de login" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Não mudar a senha" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Nenhum usuário(s) encontrado." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "O usuário %s já existe!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Adicionado usuário" -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Você mudou os priviléios para %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Você revogou os privilégios para %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "A senha para %s foi modificada com sucesso." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Eliminando %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Nenhum usuário selecionado para exclusão!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Recarregando os privilégios" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Os usuários selecionados foram apagados com sucesso." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Os privilégios foram recarregados com sucesso." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Editar Privilégios" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Revogar" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Avaliação dos usuários" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Conceder/Grant" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Qualquer" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Adicionar novo usuário" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Remover os usuários selecionados" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Revogar todos os privilégios ativos dos usuarios e depois apagar eles." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Eliminar o Banco de Dados que possui o mesmo nome dos usuários." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5240,50 +4926,50 @@ msgstr "" "privilégios que o servidor usa se alterações manuais forem feitas nele. " "Neste caso, você deve usar %sRELOAD PRIVILEGES%s antes de continuar.." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "O usuário selecionado não foi encontrado na tabela de privilégios." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Privilégios específicos da coluna" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Adicionar privilégios nas seguintes Banco de Dados" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Coringas _ e % precisam ser precedidos com uma \\ para serem usados " "literalmente" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Adicionar privilégios nas seguintes tabelas" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Mudar informações de login / Copiar usuário" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Criar um novo usuário com os mesmos privilégios e ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... manter o antigo." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... apagar o antigo da tabela de usuários." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... revogar todos privilégios do usuário antigo e depois apagar ele." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5291,44 +4977,44 @@ msgstr "" " ... apagar o antigo da tabela de usuários e depois recarregar os " "privilégios." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Banco de Dados para usuário" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Nenhum" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Criar Banco de Dados com o mesmo nome e conceder todos os privilégios" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Conceder todos os privilégios no nome coringa (nome_do_usuário_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "Conceder todos os privilégios no banco de dados "%s"" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Usuários que têm acesso à "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "global" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "Específico do Banco de Dados" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "coringa" @@ -8102,25 +7788,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "Id da linha inserida: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Exibindo como código PHP" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Exibindo consulta SQL" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Problemas com o índice da tabela `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Nome" @@ -8173,13 +7859,6 @@ msgstr "" msgid "Show insert query" msgstr "Exibindo consulta SQL" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "e então" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Retornar" @@ -8262,7 +7941,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Adicionar ao índice  %s coluna(s)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Contador da coluna deve ser maior que zero." @@ -8376,41 +8055,6 @@ msgstr "Verificar integridade referencial:" msgid "Show tables" msgstr "Mostrar tabelas" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Uso do espaço" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Uso" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Efetivo" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Estatísticas do registros" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Comandos" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinâmico" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Tamanho do registro" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Uso do espaço" @@ -8444,7 +8088,6 @@ msgid "Row length" msgstr "Tamanho do registro" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Tamanho do registro " @@ -8516,50 +8159,50 @@ msgstr "Nenhum" msgid "Column %s has been dropped" msgstr "Tabela %s foi eliminada" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Uma chave primária foi adicionada a %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Um índice foi adicionado a %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Ver relações" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Propor estrutura da tabela" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "Adicionar %s campo(s)" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "No final da tabela" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "No início da tabela" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Depois %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Criar um índice em %s colunas" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "Particionado" @@ -8601,6 +8244,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -9004,6 +8651,9 @@ msgstr "Renomear a tabela para " #~ msgid "Process list" #~ msgstr "Lista de processos" +#~ msgid "Reload privileges" +#~ msgstr "Recarregar privilégios" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/ro.po b/po/ro.po old mode 100755 new mode 100644 index 09e62fe9a..afee73a18 --- a/po/ro.po +++ b/po/ro.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-05-16 01:40+0200\n" "Last-Translator: \n" "Language-Team: romanian \n" @@ -20,11 +16,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Arată toate" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -43,53 +39,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Caută" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Execută" @@ -115,7 +95,7 @@ msgstr "Folosește această valoare" msgid "Database %1$s has been created." msgstr "Baza de date %1$s a fost creată." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Comentarii referitoare la baza de date: " @@ -142,17 +122,10 @@ msgstr "Denumirile coloanelor" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Tip" @@ -165,7 +138,7 @@ msgstr "Tip" msgid "Null" msgstr "Nul" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -189,24 +162,18 @@ msgstr "Trimitere la" msgid "Comments" msgstr "Comentarii" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Nu" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -215,15 +182,9 @@ msgstr "Nu" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -242,137 +203,129 @@ msgstr "Vizualizarea schemei bazei de date" msgid "No tables found in database." msgstr "Nu s-a găsit nici un tabel în baza de date." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Selectează tot" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Deselectează tot" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Cîmpul de denumire al bazei de date este gol!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Baza de date %s a fost redenumită în %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Baza de date %s a fost copiata la %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Redenumire bază de date în" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Comanda" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "și apoi" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Copiază baza de date" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Numai structura" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Structura și date" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Numai date" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREEAZĂ BAZA DE DATE înainte de copiere" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Adăugare %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Adaugă valoare pentru AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Adaugă constrângeri" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Schimbă la tabela copiată" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "BLOB Repository" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Stare" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Activat" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Dezactivează" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Deteriorat" -#: db_operations.php:577 +#: db_operations.php:566 msgctxt "BLOB repository" msgid "Repair" msgstr "Repară" -#: db_operations.php:585 +#: db_operations.php:574 msgctxt "BLOB repository" msgid "Disabled" msgstr "Dezactivat" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Activează" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Interclasare" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -381,14 +334,14 @@ msgstr "" "Opțiunile adiționale pentru folosirea tabelelor intercalate au fost " "dezactivate. Pentru a afla de ce ... %shere%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Editează paginile PDF" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -397,11 +350,7 @@ msgstr "Tabel" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Linie" @@ -409,42 +358,30 @@ msgstr "Linie" msgid "Size" msgstr "Mărime" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "în folosință" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Creare" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Ultima actualizare" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Ultima verficare" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -506,11 +443,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Sau" @@ -544,85 +477,85 @@ msgstr "Utilizare tabele" msgid "SQL query on database %s:" msgstr "Comandă SQL pe baza de date %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Trimite comanda" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Acces interzis" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "cel puțin unul dintre cuvinte" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "toate cuvintele" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "fraza exactă" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "ca o expresie" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Caută rezultate pentru \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s rezultat(e) în interiorul tabelului %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Navigare" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Șterge" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Total: %s rezultat(e)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Caută în baza de date" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Cuvînt/valoare de căutat (metacaracter: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Găsește:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Cuvinte despărțite de un spațiu (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "În interiorul tabelei(lor):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -630,36 +563,36 @@ msgstr "În cîmpul:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Inserare" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Structură" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Aruncă" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Golește" @@ -669,25 +602,25 @@ msgstr "Golește" msgid "Table %s has been emptied" msgstr "Tabelul %s a fost golit" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Vizualizarea %s a fost eliminată" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Tabelul %s a fost aruncat" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "Monitorizarea este activată" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "Monitorizarea nu este activată" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -695,92 +628,86 @@ msgid "" msgstr "" "Această vedere are minim acest număr de rânduri. Vedeți %sdocumentation%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Vizualizare" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replicare" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Sumă" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s este motorul de stocare stabilit implicit pe acest server MySQL." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Cele bifate:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Marchează toate" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Demarchează toate" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Verificare depășit" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Vizualizare imprimare" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Verificare tabel" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimizare tabel" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Reparare tabel" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analizare tabel" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Exportă" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Dicționar de date" @@ -792,10 +719,10 @@ msgstr "Tabelele urmărite" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -815,8 +742,8 @@ msgstr "Actualizat(ă)" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Acțiune" @@ -855,8 +782,8 @@ msgstr "Instantaneu al structurii" msgid "Untracked tables" msgstr "Tabele fără monitorizare" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Tabele monitorizate" @@ -943,7 +870,7 @@ msgstr "Eticheta a fost ștearsă." msgid "Showing bookmark" msgstr "Afișînd semn de carte" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Semnul de carte %s a fost creat" @@ -1028,293 +955,186 @@ msgstr "Numele gazdei este gol!" msgid "The user name is empty!" msgstr "Numele de utilizator este gol!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Parola este goală!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Parolele nu corespund!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Adaugă un utilizator nou" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Creare relație" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reloading the privileges" -msgid "Reloading Privileges" -msgstr "Reîncărcarea drepturilor" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Eliminarea utilizatorilor selectați" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Renunță" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Local" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Procese" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "E bine" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Redenumire bază de date în" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Baza de date" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Copiază baza de date" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Set de caractere" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Tabelul trebuie să conțină cel puțin un cîmp." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Creare tabel" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Caută" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Modificările au fost salvate" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Relație ștearsă" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "FOREIGN KEY relation added" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Relație internă adăugată" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Eroare: Relația nu a fost adăugată." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Eroare: relația deja există." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Eroare la salvarea coordonatelor pentru Designer." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Facilități generale" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Dezactivat" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Alegere cheie referențiată" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Alegeți cheia străină" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Vă rugăm să alegeți cheia primară sau o cheie unică" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Selectează un cîmp" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy msgid "Done" msgstr "Date" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Anterior" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Următorul" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Total" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Binar" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Mar" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Apr" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Mai" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Iun" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Iul" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Aug" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Oct" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Ian" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Feb" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Apr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1322,178 +1142,178 @@ msgid "May" msgstr "Mai" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Iun" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Iul" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Aug" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Sep" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Oct" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Noi" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Dec" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Dum" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Lun" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Mar" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Vin" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Dum" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Lun" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Mar" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Mie" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Joi" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Vin" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sâm" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Dum" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Lun" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Mar" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Mie" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Joi" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Vin" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Sâm" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "Wiki" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "în folosință" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1552,7 +1372,7 @@ msgstr "Indexuri" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unic" @@ -1570,7 +1390,7 @@ msgid "Comment" msgstr "Comentariu" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1593,8 +1413,8 @@ msgid "" "removed." msgstr "Indecșii %1$s și %2$s par a fi egali și unul din ei poate fi șters." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Baze de date" @@ -1771,11 +1591,7 @@ msgstr "Parolă:" msgid "Server Choice" msgstr "Alegerea serverului" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Trebuie sa aveti activat \"cookies\"." @@ -1857,11 +1673,7 @@ msgstr "" "Nu pot folosi funcțiile iconv nici libiconv nici recode_string în timp ce " "extensia este încărcată. Verificați configurația PHP." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Daca primesti o pagina goala, totul " "pare sa fie bine." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Nu s-a putut încărca configurația implicită din: „%1$s”" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1899,50 +1703,30 @@ msgstr "" "Directiva $cfg['PmaAbsoluteUri'] TREBUIE să fie stabilită în " "fișierul de configurare!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Index de server nevalid: „%s”" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" "Gazdă nevalidă pentru serverul %1$s. Vă rugăm să revizuiți configurația " "dumneavoastră." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Server" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Metodă de autentificare nevalidă stabilită în configurație:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Metodă de autentificare nevalidă stabilită în configurație:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Ar trebui sa reactualizati serverul %s %s la o versiune mai noua." @@ -1969,7 +1753,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Documentație" @@ -1983,138 +1767,138 @@ msgstr "Comanda SQL" msgid "MySQL said: " msgstr "MySQL zice: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Explică SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Sari peste explicarea SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "fără cod PHP" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Creează cod PHP" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Reîncarcă" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Sari peste validarea SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Validează SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Motoare" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Creare profil" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Timp" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "octeți" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KiO" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MiO" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GiO" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TiO" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PiO" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EiO" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d %B %Y la %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s zile, %s ore, %s minute și %s secunde" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Începe" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Anterior" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Sfîrșit" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Sari la baza de date "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "Funcționalitatea %s este afectată de o eroare cunoscută, vedeți %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2135,7 +1919,7 @@ msgid "Events" msgstr "Evenimente" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Nume" @@ -2163,15 +1947,15 @@ msgstr "Interogare prin exemplu" msgid "Designer" msgstr "Designer" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Importă" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Drepturi de acces" @@ -2190,11 +1974,7 @@ msgid "" msgstr "Poate fi aproximativ. Vezi FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Asupra" @@ -2211,7 +1991,7 @@ msgstr "Serverul nu răspunde" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(sau soclul serverului MySQL local nu este configurat momentan)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Detalii..." @@ -2221,36 +2001,22 @@ msgid "Change password" msgstr "Schimbare parolă" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Nu există parolă" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Parola" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Re-tastează" @@ -2265,20 +2031,12 @@ msgid "MySQL 4.0 compatible" msgstr "Compatibil MySQL 4.0" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Generează parolă" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Generează" @@ -2291,17 +2049,23 @@ msgstr "Creează bază de date nouă" msgid "Create" msgstr "Creează" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Nu există drepturi de acces" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Tabelul trebuie să conțină cel puțin un cîmp." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Creează tabel nou în baza de date %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2368,11 +2132,7 @@ msgid "remember template" msgstr "ține minte șablonul" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Setul de caractere al fișierului:" @@ -2383,7 +2143,7 @@ msgstr "Compresie" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Nici unul(a)" @@ -2425,11 +2185,7 @@ msgstr "" msgid "File to import" msgstr "Fișier de importat" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Locația fișierului textual" @@ -2437,20 +2193,12 @@ msgstr "Locația fișierului textual" msgid "File uploads are not allowed on this server." msgstr "Încărcările de fișiere nu sînt permise pe acest server." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Directorul stabilit pentru încărcare nu poate fi găsit" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "director de încărcare al serverului Web" @@ -2585,11 +2333,7 @@ msgstr "Sortare după cheie" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Opțiuni" @@ -2659,14 +2403,14 @@ msgstr "Afișează înregistrări" msgid "total" msgstr "total" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "comanda a durat %01.4f sec" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Schimbare" @@ -2736,11 +2480,7 @@ msgstr "Buffer Pool Usage" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Total" @@ -3027,11 +2767,7 @@ msgstr "" "number." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Format" @@ -3103,13 +2839,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Date" @@ -3158,15 +2889,9 @@ msgstr "Tip MIME" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Gazda" @@ -3365,7 +3090,7 @@ msgstr "Modul de export" msgid "Open new phpMyAdmin window" msgstr "Deschide fereastră phpMyAdmin nouă" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Nu există tabele" @@ -3378,7 +3103,7 @@ msgstr "Rezultat SQL" msgid "Generated by" msgstr "Generat de" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL a dat un set de rezultate gol (zero linii)." @@ -3528,20 +3253,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primar" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Index" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Tot textul" @@ -3766,6 +3491,10 @@ msgstr "Acest format nu are opțiuni" msgid "not OK" msgstr "Nu este bine" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "E bine" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Activat" @@ -3788,7 +3517,7 @@ msgid "" msgstr "" "Parcurgeti documentatia pentru modul de updatare a Column_comments Table" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Comandă SQL salvată" @@ -3839,13 +3568,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Nume utilizator" @@ -3865,22 +3589,14 @@ msgstr "Afișează stare sclav" msgid "Slave status" msgstr "Afișează stare sclav" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Variabil" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Valoare" @@ -3898,40 +3614,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Oricare utilizator" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Utilizare cîmp text" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Oricare gazdă" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Local" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Această gazdă" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Utilizare tabel gazde" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3955,7 +3642,6 @@ msgid "Use Host Table" msgstr "Utilizare tabel gazde" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3989,29 +3675,29 @@ msgstr "Limbă necunoscută: %1$s." msgid "Servers" msgstr "Servere" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Variabile" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Seturi de caractere" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Motoare" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Jurnal binar" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Procese" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -4041,51 +3727,51 @@ msgstr "" msgid "Target database" msgstr "Caută în baza de date" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Execută interogare/interogări SQL pe serverul %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Execută interogare SQL asupra bazei de date %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Denumirile coloanelor" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Pune semn de carte la această comandă SQL" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Permite tuturor utilizatorilor să acceseze acest semn de carte" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Înlocuiește semnul de carte cu același nume" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "A nu se suprascrie peste această interogare din cealaltă fereastră" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Delimitator" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Afișează această comandă din nou aici " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Trimite" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Numai vizualizare" @@ -4261,13 +3947,13 @@ msgstr "Definiție PARTIȚIE" msgid "Save" msgstr "Salveaza" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "Adaugă %s cîmp(uri)" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4481,8 +4167,8 @@ msgstr "Resetare" msgid "Protocol version" msgstr "Versiune protocol" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Utilizator" @@ -4935,118 +4621,118 @@ msgstr "Motoare de stocare" msgid "View dump (schema) of databases" msgstr "Vizualizarea schemei bazei de date" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Include toate privilegiile, excluzand GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Permite alterarea structurii la tabelele deja existente." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Permite alterarea și aruncarea rutinelor stocate." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Permite crearea de noi baze de date și tabele." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Permite crearea rutinelor stocate." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Permite crearea de noi tabele." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Permite crearea de tabele temporare." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Permite crearea, aruncarea și redenumirea conturilor de utilizator." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Permite crearea noilor viziuni." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Permite stergere de date." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Permite stergerea unei baze de date sau a unor tabele." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Permite aruncarea a unei baze de date." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Permite configurarea evenimentelor pentru planificatorul de evenimente" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Permite executarea rutinelor stocate." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "" "Permite importarea datelor in fisiere și exportarea acestora din fisiere." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Permite adaugarea utilizatorilor și drepturilor fara reincarcarea tabelelor " "de drepturi." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Permite crearea și stergerea indexurilor." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Permite inserarea și înlocuirea datelor." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Permite blocarea tabelelor din firul curent de execuție." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Limitează numărul de noi conexiuni care pot fi deschise de utilizator într-o " "oră." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Limiteaza numarul de comenzi care pot fi trimise de utilizator către server " "într-o oră." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5054,61 +4740,61 @@ msgstr "" "Limitează numărul de comenzi pentru schimbarea vreunui tabel sau vreunei " "baze de date executabile de utilizator într-o oră." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "" "Limitează numărul conexiunilor simultane pe care le poate avea utilizatorul." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Permite vizualizarea proceselor tuturor utilizatorilor" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Nu are efect în această versiune MySQL." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Permite reîncărcarea setărilor de server și golirea memoriei cache a " "serverului." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Permite utilizatorului de a interoga locația slave/master." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Necesară pentru „slave replication”." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Permite citirea datelor." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Permite accesul la lista completă a bazelor de date." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Permite executarea interogărilor SHOW CREATE VIEW." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Permite oprirea serverului." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5118,160 +4804,160 @@ msgstr "" "pentru majoritatea operațiunilor administrative, cum ar fi setarea " "variabilelor globale sau oprirea firelor de execuție a altor utilizatori." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Permite crearea și eliminarea declanșatorilor" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Permite schimbarea datelor." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Fără drepturi." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Nici unul(a)" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Drepturi specifice de tabele" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Important: numele drepturilor de acces MySQL apar în engleză" -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Privilegii globale" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Drepturi specifice bazei de date" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administrare" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Limitare de resurse" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" "Observație: Prin stabilirea acestor opțiuni la 0 (zero) se elimină " "restricția." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Informații de autentificare" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Nu schimbați parola" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Nu s-a găsit nici un utilizator." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Utilizatorul %s există deja!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Ați adăugat un nou utilizator." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Ați actualizat privilegiile pentru %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Drepturile tale au fost revocate pentru %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Parola pentru %s a fost schimbată cu succes." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Șterge %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Nici un utilizator ales pentru ștergere!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Reîncărcarea drepturilor" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Utilizatorii selectați au fost eliminați." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Drepturile au fost reîncarcate cu succes." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Editează drepturile de acces" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Revocare" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Descriere utilizator" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Permite" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Oricare" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Adaugă un utilizator nou" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Eliminarea utilizatorilor selectați" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Revocarea tuturor drepturilor active ale utilizatorilor și stergerea " "acestora." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Aruncă baza de date care are același nume ca utilizatorul." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5284,94 +4970,94 @@ msgstr "" "În acest caz, reîncărcați de aici înainte de a continua %sreîncărcarea " "drepturilor%s." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Utilizatorul selectat nu a fost găsit în tabelul de drepturi." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Drepturi specifice coloanei" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Adaugă drepturi la baza de date următoare" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "Metacaracterele _ și % trebuiesc însoțite de \\ pentru a le aplica" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Adaugă drepturi la următorul tabel" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Schimbă informațiile de autentificare/Copiază utilizator" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Creează un utilizator nou cu aceleași privilegii și..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... menține cel vechi." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... șterge cel vechi din tabelul de utilizatori." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ...revocă toate privilegiile active de la utilizatorul vechi și șterge-l " "după aceea." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" " ... șterge cel vechi din tabelul de utilizatori și reîncarcă privilegiile." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Bază de date pentru utilizatorul" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Nici unul(a)" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Creează o bază de date cu același nume și acordă toate privilegiile" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Grant all privileges on wildcard name (username\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "Verifică privilegiile pentru baza de date "%s"." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Utilizatorul are acces la "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "global" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "specific bazei de date" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "Metacaracter" @@ -8128,25 +7814,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "ID rînd inserat: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Afișare ca și cod PHP" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Afișare interogare SQL" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Probleme cu indexul tabelului `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Etichetă" @@ -8200,13 +7886,6 @@ msgstr "" msgid "Show insert query" msgstr "Afișare interogare SQL" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "și apoi" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Revenire" @@ -8288,7 +7967,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Adaugă la coloana(ele) index  %s " -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Numărul coloanelor trebuie să fie mai mare de zero." @@ -8402,41 +8081,6 @@ msgstr "Verificarea integrității referinței:" msgid "Show tables" msgstr "Arată tabelele" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Utilizare spațiu" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Utilizare" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Efectiv" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Statisticile rîndului" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Comenzi" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinamic" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Lungime linie" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Utilizare spațiu" @@ -8470,7 +8114,6 @@ msgid "Row length" msgstr "Lungime linie" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Mărime linie " @@ -8545,50 +8188,50 @@ msgstr "Nici unul/una" msgid "Column %s has been dropped" msgstr "Tabelul %s a fost aruncat" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "A fost adăugată o cheie primară la %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "A fost adăugat un index la %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Vizualizare relațională" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Propune structura de tabele" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "Adaugă %s cîmp(uri)" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "La sfîrșitul tabelului" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "La începutul tabelului" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "După %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Creează un index pe %s coloană" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "partiționat" @@ -8630,6 +8273,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/ru.po b/po/ru.po old mode 100755 new mode 100644 index 105c7d99c..016bb2f7f --- a/po/ru.po +++ b/po/ru.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-30 23:23+0200\n" "Last-Translator: Michal \n" "Language-Team: russian \n" @@ -20,11 +16,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Показать все" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -43,53 +39,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Поиск" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "OK" @@ -115,7 +95,7 @@ msgstr "Использовать это значение" msgid "Database %1$s has been created." msgstr "База данных %1$s была создана." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Комментарий к базе данных:" @@ -142,17 +122,10 @@ msgstr "Названия столбцов" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Тип" @@ -165,7 +138,7 @@ msgstr "Тип" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -189,24 +162,18 @@ msgstr "Связи" msgid "Comments" msgstr "Комментарии" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Нет" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -215,15 +182,9 @@ msgstr "Нет" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -242,141 +203,133 @@ msgstr "Отобразить дамп (схему) базы данных" msgid "No tables found in database." msgstr "Таблиц в базе данных не обнаружено." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Выделить все" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Снять выделение" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Не указано имя базы данных!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "База данных `%s` переименована в `%s`." -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "База данных %s была скопирована в %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Переименовать базу данных в" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Команда" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "и затем" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Скопировать базу данных в" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Только структура" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Структура и данные" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Только данные" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "Перед копированием создать базу данных (CREATE DATABASE)" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Добавить %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Добавить AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Добавить ограничения" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Переключиться на скопированную базу данных" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "Хранилище данных типа BLOB" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Состояние" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Доступно" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Отключить" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Повреждено" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair" msgctxt "BLOB repository" msgid "Repair" msgstr "Исправление" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Недоступно" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Включить" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Сравнение" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -385,14 +338,14 @@ msgstr "" "Дополнительные возможности для работы со связанными таблицами недоступны. " "Для определения причины нажмите %sздесь%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Редактирование PDF-страниц" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -401,11 +354,7 @@ msgstr "Таблица " #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Строки" @@ -413,42 +362,30 @@ msgstr "Строки" msgid "Size" msgstr "Размер" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "используется" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Создание" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Последнее обновление" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Последняя проверка" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -511,11 +448,7 @@ msgstr "Удалить" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Или" @@ -549,85 +482,85 @@ msgstr "Использовать таблицы" msgid "SQL query on database %s:" msgstr "SQL-запрос к базе данных %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Выполнить запрос" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "В доступе отказано" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "любое из слов" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "все слова" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "точное соответствие" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "регулярное выражение" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Результаты поиска по "%s" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s вхождения(ий) в таблице %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Обзор" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Удалить" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Итого: %s вхождения(ий)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Поиск в базе данных" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Слово(а) или значение(я) для поиска (групповой символ: "%"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Искать:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Слова разделяются пробелом (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "В таблице/таблицах:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -635,36 +568,36 @@ msgstr "Внутри поля:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Вставить" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Структура" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Удалить" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Очистить" @@ -674,25 +607,25 @@ msgstr "Очистить" msgid "Table %s has been emptied" msgstr "Таблица %s была очищена" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Представление %s было удалено" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Таблица %s была удалена" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "Слежение включено." -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "Слежение выключено." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -701,92 +634,86 @@ msgstr "" "Данное представление имеет, по меньшей мере, указанное количество строк. " "Пожалуйста, обратитесь к %sдокументации%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Представление" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Репликация" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Всего" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s - тип таблиц данного MySQL сервера устанавливаемый по умолчанию." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "С отмеченными:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Отметить все" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Снять выделение" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Отметить требующие оптимизации" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Версия для печати" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Проверить таблицу" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Оптимизировать таблицу" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Восстановить таблицу" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Анализ таблицы" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Экспорт" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Словарь данных" @@ -797,10 +724,10 @@ msgstr "Отслеживаемые таблицы" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -820,8 +747,8 @@ msgstr "Обновлён" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Действие" @@ -855,8 +782,8 @@ msgstr "Обзор структуры" msgid "Untracked tables" msgstr "Неотслеживаемые таблицы" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "Отслеживать таблицу" @@ -941,7 +868,7 @@ msgstr "Закладка удалена." msgid "Showing bookmark" msgstr "Отображение закладки" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Закладка "%s" создана" @@ -1026,298 +953,189 @@ msgstr "Пустое имя хоста!" msgid "The user name is empty!" msgstr "Не задано имя пользователя!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Пароль не задан!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Некорректное подтверждение пароля!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Добавить нового пользователя" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create version" -msgid "Create User" -msgstr "Создать версию" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Перезагрузить привилегии" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Удалить выделенных пользователей" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "Закрыть" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Отмена" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Загрузить" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Процессы" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Переименовать базу данных в" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "База данных" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Скопировать базу данных в" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Кодировка" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "У таблицы должно быть, как минимум, одно поле." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Создать таблицу" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Поиск" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Изменения сохранены" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Связь удалена" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "Добавлена связь на внешний ключ (FOREIGN KEY)" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Добавлена внутренняя связь" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Ошибка: Связь не добавлена." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Ошибка: Связь уже существует." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Ошибка сохранения координат." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Основные возможности связей" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Недоступно" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Выберите ссылочный ключ" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Выберите внешний ключ" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" "Выберите поле являющееся первичным (PRIMARY), или уникальным (UNIQUE) " "индексом!" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Выбор отображаемого столбца" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "Donate" msgid "Done" msgstr "Пожертвование" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Назад" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Следующий" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Всего" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Двоичный" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Мар" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Апр" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Май" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Июн" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Июл" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Авг" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Окт" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Янв" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Фев" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Мар" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Апр" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1325,178 +1143,178 @@ msgid "May" msgstr "Май" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Июн" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Июл" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Авг" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Сен" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Окт" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Ноя" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Дек" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Вс" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Пн" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Вт" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Пт" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Вс" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Пн" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Вт" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Ср" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Чт" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Пт" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Сб" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Вс" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Пн" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Вт" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Ср" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Чт" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Пт" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Сб" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "Вики" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "используется" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1557,7 +1375,7 @@ msgstr "Индексы" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Уникальный" @@ -1575,7 +1393,7 @@ msgid "Comment" msgstr "Комментарий" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1598,8 +1416,8 @@ msgid "" "removed." msgstr "Индексы %1$s и %2$s равнозначны и один из них может быть удалён." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Базы данных" @@ -1771,11 +1589,7 @@ msgstr "Пароль:" msgid "Server Choice" msgstr "Выбор сервера" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Для полноценной работы необходима поддержка cookies браузером." @@ -1856,11 +1670,7 @@ msgstr "" "Несмотря на то что необходимые расширения загружены, использование функций " "iconv, libiconv или recode_string - невозможно. Проверьте настройки PHP." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Если отобразится пустая страница - все в порядке." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Невозможно загрузить изначальную конфигурацию из: "%1$s"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1898,51 +1700,31 @@ msgstr "" "Директива $cfg['PmaAbsoluteUri'] ДОЛЖНА быть установлена в " "конфигурационном файле!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Неправильный номер сервера: "%s"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" "Для сервера %1$s указано неверное имя хоста. Исправьте настройки заданные в " "конфигурационном файле phpMyAdmin." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Сервер" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -======= #: libraries/common.inc.php:816 ->>>>>>> origin/master msgid "Invalid authentication method set in configuration:" msgstr "" "В конфигурационном файле phpMyAdmin установлен неверный метод аутентификации:" -<<<<<<< HEAD -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Необходимо обновить %s до версии %s или выше." @@ -1968,7 +1750,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Документация" @@ -1982,139 +1764,139 @@ msgstr "SQL-запрос" msgid "MySQL said: " msgstr "Ответ MySQL: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Анализ запроса" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Убрать анализ" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "Убрать PHP-код" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "PHP-код" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Обновить" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Убрать проверку синтаксиса SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Проверка синтаксиса" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Типы таблиц" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Профилирование" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Время" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Байт" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "КБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "МБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "ГБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "ТБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "ПБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "ЭБ" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%B %d %Y г., %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s дней, %s часов, %s минут и %s секунд" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Начало" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Назад" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Конец" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Перейти к базе данных "%s"" -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" "Работа параметра "%s" подвержена ошибке, описание смотрите на %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2135,7 +1917,7 @@ msgid "Events" msgstr "События" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Имя" @@ -2163,15 +1945,15 @@ msgstr "Запрос по шаблону" msgid "Designer" msgstr "Дизайнер" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Импорт" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Привилегии" @@ -2190,11 +1972,7 @@ msgid "" msgstr "Может быть приблизительно. См. FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Фрагментировано" @@ -2214,7 +1992,7 @@ msgstr "Сервер не отвечает" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(либо сокет локального MySQL-сервера некорректно настроен)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Детали..." @@ -2224,36 +2002,22 @@ msgid "Change password" msgstr "Изменить пароль" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Без пароля" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Пароль" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Подтверждение" @@ -2268,20 +2032,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 совместимо" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Создать пароль" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Генерировать" @@ -2294,17 +2050,23 @@ msgstr "Новая база данных" msgid "Create" msgstr "Создать" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Нет привилегий" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "У таблицы должно быть, как минимум, одно поле." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Создать новую таблицу в базе данных %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2371,11 +2133,7 @@ msgid "remember template" msgstr "запомнить шаблон" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Кодировка файла:" @@ -2386,7 +2144,7 @@ msgstr "Упаковать" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Нет" @@ -2431,11 +2189,7 @@ msgstr "Пожалуйста, подождите, файл был загруже msgid "File to import" msgstr "Импортируемый файл" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Выбор файла" @@ -2443,20 +2197,12 @@ msgstr "Выбор файла" msgid "File uploads are not allowed on this server." msgstr "Загрузка файлов на сервер, невозможна." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Установленный каталог загрузки не доступен" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "Из каталога загрузки" @@ -2591,11 +2337,7 @@ msgstr "Сортировать по индексу" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Параметры" @@ -2665,14 +2407,14 @@ msgstr "Отображает строки" msgid "total" msgstr "всего" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "запрос занял %01.4f сек." #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Изменить" @@ -2742,11 +2484,7 @@ msgstr "Использование" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Всего" @@ -3038,11 +2776,7 @@ msgstr "" "порядковый номер." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Формат" @@ -3116,13 +2850,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Данные" @@ -3171,15 +2900,9 @@ msgstr "MIME-тип" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Хост" @@ -3374,7 +3097,7 @@ msgstr "Экспортировать содержимое" msgid "Open new phpMyAdmin window" msgstr "Открыть phpMyAdmin в новом окне" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Нет таблиц" @@ -3387,7 +3110,7 @@ msgstr "Результат SQL-запроса" msgid "Generated by" msgstr "Создан" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL вернула пустой результат (т.е. ноль строк)." @@ -3537,20 +3260,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Первичный" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Индекс" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Полнотекстовый" @@ -3775,6 +3498,10 @@ msgstr "Для этого формата нет настраиваемых па msgid "not OK" msgstr "Не готово" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Доступно" @@ -3797,7 +3524,7 @@ msgid "" msgstr "" "Необходимо обновить таблицу column_comments. Детали смотрите в документации." -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Созданные закладки" @@ -3850,13 +3577,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Имя пользователя" @@ -3873,22 +3595,14 @@ msgstr "Статус Master" msgid "Slave status" msgstr "Статус Slave" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Переменная" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Значение" @@ -3908,40 +3622,11 @@ msgstr "" msgid "Add slave replication user" msgstr "Добавьте подчиненного пользователя репликации" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Любой пользователь" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Использовать текстовое поле" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Любой хост" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Локальный" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Этот хост" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Использовать таблицу хостов" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3965,7 +3650,6 @@ msgid "Use Host Table" msgstr "Использовать таблицу хостов" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -4001,29 +3685,29 @@ msgstr "Неизвестный язык: %1$s." msgid "Servers" msgstr "Сервера" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Переменные" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Кодировки" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Типы таблиц" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Бинарный журнал" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Процессы" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Синхронизировать" @@ -4050,51 +3734,51 @@ msgstr "Различие" msgid "Target database" msgstr "Целевая база данных" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Выполнить SQL-запрос(ы) на сервере %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Выполнить SQL-запрос(ы) к базе данных %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Названия столбцов" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Создание закладки" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Доступна для всех пользователей" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Заменить существующую с таким же именем" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Заблокировать содержимое окна запросов" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Разделитель" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr "Показать данный запрос снова" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Выполнить" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Просмотр" @@ -4271,13 +3955,13 @@ msgstr "Определение разделов (PARTITION)" msgid "Save" msgstr "Сохранить" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add column(s)" msgid "Add %s column(s)" msgstr "Добавить поле(я)" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4493,8 +4177,8 @@ msgstr "Сбросить" msgid "Protocol version" msgstr "Версия протокола" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Пользователь" @@ -4959,118 +4643,118 @@ msgstr "Типы таблиц" msgid "View dump (schema) of databases" msgstr "Отобразить дамп (схему) баз данных" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Содержит все привилегии, за исключением GRANT" -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Разрешает изменение структуры существующих таблиц" -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Разрешает изменение и удаление хранимых процедур" -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Разрешает создание новых баз данных и таблиц" -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Разрешает создание хранимых процедур" -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Разрешает создание новых таблиц" -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Разрешает создание временных таблиц" -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" "Разрешает создание, удаление и переименование учетных записей пользователей" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Разрешает создание новых представлений (CREATE VIEW)" -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Разрешает удаление данных" -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Разрешает удаление баз данных и таблиц" -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Разрешает удаление таблиц" -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Разрешает настройку отложенных событий" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Разрешает выполнение хранимых процедур" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Разрешает импорт и экспорт данных в файлы" -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Разрешает добавление пользователей и привилегий без перезагрузки таблиц " "привилегий" -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Разрешает создание и удаление индексов" -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Разрешает вставку и замену данных" -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Разрешает блокировку таблиц для текущего потока" -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Максимальное количество новых подключений, которые пользователь может " "установить в течение часа" -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Максимальное количество запросов, которые пользователь может отправить в " "течение часа" -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5078,58 +4762,58 @@ msgstr "" "Максимальное количество команд изменяющих какую-либо таблицу или базу " "данных, которые пользователь может выполнить в течение часа" -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Максимальное количество одновременных подключений одного пользователя" -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Разрешает просмотр процессов всех пользователей" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Не доступно в данной версии MySQL!" -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "Разрешает перезагрузку настроек сервера и очистку его кешей" -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Разрешает запрашивать местонахождение головного и подчиненных серверов" -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Необходимо для подчиненных серверов при репликации" -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Разрешает выборку данных" -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Разрешает доступ к полному списку баз данных" -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Разрешает вывод запроса создающего представление (SHOW CREATE VIEW)" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Разрешает остановку сервера" -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5140,157 +4824,157 @@ msgstr "" "установка глобальных переменных или завершение процессов других " "пользователей)" -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Разрешает создание и удаление триггеров" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Разрешает изменение данных" -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Нет привилегий" -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Нет" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr " Привилегии уровня таблицы" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr "Примечание: типы привилегий MySQL отображаются по-английски." -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Глобальные привилегии" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Привилегии уровня базы данных" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Администрирование" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Ограничение на использование ресурсов" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" "Замечание: Установка значения параметров в 0 (ноль), снимает ограничения." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Информация учетной записи" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Не менять пароль" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Пользователей не найдено." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Пользователь %s уже существует!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Был добавлен новый пользователь." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Были изменены привилегии для %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Отменены привилегии для %s." -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Пароль для %s был успешно изменен." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Удаление %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Не выбраны пользователи подлежащие удалению!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Перезагрузка привилегий" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Выбранные пользователи были успешно удалены." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Привилегии были успешно перезагружены." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Редактирование привилегий" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Отменить" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Обзор учетных записей" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "GRANT" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Любой" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Добавить нового пользователя" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Удалить выделенных пользователей" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Отменить все активные привилегии пользователей и затем удалить их." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Удалить базы данных, имена которых совпадают с именами пользователей." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5303,98 +4987,98 @@ msgstr "" "отличаться от привилегий, используемых сервером, если они были изменены " "вручную. В таком случае необходимо %sперезагрузить привилегии%s." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Выделенный пользователь не был найден в таблице привилегий." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Привилегии уровня столбца" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Добавить привилегии на следующую базу" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "При использовании в имени базы данных символов нижнего подчеркивания (_) и " "процента (%), необходимо экранировать их символом обратной косой черты (\\), " "в противном случае они будут интерпретированы как групповые символы" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr " Добавить привилегии на следующую таблицу" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Изменить/Копировать учетную запись" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Создать нового пользователя с такими же привилегиями..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "и сохранить старого." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr "и удалить старого из таблиц пользователей." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr ", отменить все активные привилегии старого и затем удалить его." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr ", удалить старого из таблиц пользователей и перезагрузить привилегии." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "База данных для пользователя" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Нет" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" "Создать базу данных с именем пользователя в названии и предоставить на нее " "полные привилегии" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" "Предоставить полные привилегии на базы данных подпадающие под шаблон (имя " "пользователя\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "Выставить полные привилегии на базу данных "%s"" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Пользователи с правами доступа к "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "Глобальный уровень" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "Уровень базы данных" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "Групповой символ" @@ -8404,25 +8088,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "Идентификатор вставленной строки: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Отображает как PHP-код" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Отображает SQL-запрос" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Проблемы с индексами таблицы `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Метка" @@ -8475,13 +8159,6 @@ msgstr "" msgid "Show insert query" msgstr "Отображает SQL-запрос" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "и затем" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Вернуться на предыдущую страницу" @@ -8562,7 +8239,7 @@ msgstr "(Имя "PRIMARY" должен иметь только msgid "Add to index  %s column(s)" msgstr "Добавить к индексу %s столбец(ы)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Количество столбцов должно быть больше нуля." @@ -8676,41 +8353,6 @@ msgstr "Проверить целостность данных:" msgid "Show tables" msgstr "Отображение таблиц" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Используемое пространство" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Использование" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Эффективность" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Статистика строк" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Характеристика" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "статический" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "динамический" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Длина строки" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Используемое пространство" @@ -8744,7 +8386,6 @@ msgid "Row length" msgstr "Длина строки" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "Размер строки" @@ -8820,50 +8461,50 @@ msgstr "Нет" msgid "Column %s has been dropped" msgstr "Таблица %s была удалена" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Был добавлен первичный ключ к %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Был добавлен индекс для %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Связи" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Анализ структуры таблицы" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add column(s)" msgid "Add column" msgstr "Добавить поле(я)" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "В конец таблицы" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "В начало таблицы" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "После %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Создать индекс для  %s  столбца/ов" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "разделён" @@ -8908,6 +8549,10 @@ msgstr "Закомментируйте эти две строки, если он msgid "SQL statements exported. Please copy the dump or execute it." msgstr "SQL выражения успешно выгружены; скопируйте, либо выполните их." +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "Закрыть" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -9360,6 +9005,9 @@ msgstr "Переименовать таблицу в" #~ msgid "Process list" #~ msgstr "Список процессов" +#~ msgid "Reload privileges" +#~ msgstr "Перезагрузить привилегии" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/si.po b/po/si.po old mode 100755 new mode 100644 index 523606b32..294300cc8 --- a/po/si.po +++ b/po/si.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-30 23:09+0200\n" "Last-Translator: Michal \n" "Language-Team: sinhala \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "සියල්ල පෙන්වන්න" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "සෙවීම" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "යන්න" @@ -113,7 +93,7 @@ msgstr "Use this value" msgid "Database %1$s has been created." msgstr "%s දත්තගබඩාව හලන ලදි." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "දත්තගබඩා විස්තර: " @@ -140,17 +120,10 @@ msgstr "තීර නම්" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "වර්ගය" @@ -163,7 +136,7 @@ msgstr "වර්ගය" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -187,24 +160,18 @@ msgstr "Links to" msgid "Comments" msgstr "විස්තරය" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "නැත" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -213,15 +180,9 @@ msgstr "නැත" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -240,142 +201,134 @@ msgstr "View dump (schema) of database" msgid "No tables found in database." msgstr "දත්තගබඩාවේ වගු කිසිවක් සොයා ගැනීමට නොමැත." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "සියල්ල තෝරන්න" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "සියල්ලේ තෝරාගැනීම ඉවත් කරන්න‍" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "දත්තගබඩා නම හිස්ව පවතී!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "%s දත්තගබඩාව %s බවට නම වෙනස් කරන ලදි" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "%s දත්තගබඩාව %s වෙතට පිටපත් කරන ලදි" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "බවට දත්තගබඩාවේ නම වෙනස් කරන්න" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "විධානය" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "සහ එවිට" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "වෙත දත්තගබඩාව පිටවත් කරන්න" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Structure only" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "සැකිල්ල සහ දත්ත" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "දත්ත පමණයි" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "පිටපත් කිරීමට ප්‍රථම දත්තගබඩාවක් සාදන්න" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "%s එක් කරන්න" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "AUTO_INCREMENT අගයක් එක් කරන්න" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "සීමා බාධවන් එක් කරන්න" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Switch to copied database" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "තත්වය" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "සක්‍රිය කරන් ලද" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "අක්‍රිය කරන ලද" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "වගුව ප්‍රතිසංස්කරණය කරන්න" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "අක්‍රිය කරන ලද" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "සක්‍රිය කරන් ලද" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Collation" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -384,14 +337,14 @@ msgstr "" "The additional features for working with linked tables have been " "deactivated. To find out why click %shere%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "PDF පිටු සංස්කරණය කරන්න" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -400,11 +353,7 @@ msgstr "වගුව" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "පේළි" @@ -412,42 +361,30 @@ msgstr "පේළි" msgid "Size" msgstr "ප්‍රමාණය" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "භාවිතා වෙමින් පවතී" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "සෑදීම" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "අවසන් යාවත් කාලීන කිරීම" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "අවසන් පරීක්ෂාව" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -508,11 +445,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "හෝ" @@ -546,85 +479,85 @@ msgstr "Use Tables" msgid "SQL query on database %s:" msgstr "SQL query on database %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "විමසුම ඉදිරිපත් කරන්න" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "පිවිසුම වලක්වා ඇත" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "අවම වශයෙන් එක් වචනයක්වත්" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "සියලු වචන" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "හරියටම වාක්‍යාංශය" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "as regular expression" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "\"%s\" %s සඳහා සෙවීම් ප්‍රතිළුල:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s match(es) inside table %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "බ්‍රවුස් කරන්න" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "ඉවත් කරන්න" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Total: %s match(es)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "දත්තගබඩාවේ සොයන්න" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Word(s) or value(s) to search for (wildcard: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "සොයන්න:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Words are separated by a space character (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "වගු(ව) තුල:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -632,36 +565,36 @@ msgstr "වගු(ව) තුල:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "ඇතුල් කරන්න" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "සැකිල්ල" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "හලන්න" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "හිස්" @@ -671,117 +604,111 @@ msgstr "හිස්" msgid "Table %s has been emptied" msgstr "%s වගුව හිස් කරන ලදි" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "View %s has been dropped" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "%s වගුව හලන ලදි" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "දර්ශනය කරන්න" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replication" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "එකතුව" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s is the default storage engine on this MySQL server." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "තෝරාගත්:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "සියල්ල කතිර කොටුගත කරන්න" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "කතිර කොටුගත කිරීම ඉවත් කරන්න" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Check tables having overhead" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "මුද්‍රණ දර්ශනය" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "වගුව පරීක්ෂා කරන්න" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "ප්‍රශස්තගත වගුව" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "වගුව ප්‍රතිසංස්කරණය කරන්න" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "වගුව විශ්ලේෂණය කරන්න" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "අපනයනය" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "දත්ත කෝෂය" @@ -793,10 +720,10 @@ msgstr "වගුව පරීක්ෂා කරන්න" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -818,8 +745,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "ක්‍රියාව" @@ -856,8 +783,8 @@ msgstr "Structure only" msgid "Untracked tables" msgstr "වගුව පරීක්ෂා කරන්න" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "වගුව පරීක්ෂා කරන්න" @@ -940,7 +867,7 @@ msgstr "පොත් සලකුණ ඉවත් කරන ලදි." msgid "Showing bookmark" msgstr "පොත් සලකුණ පෙන්වන්න" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "%s පොත් සලකුණ සාදන ලදි" @@ -1023,294 +950,188 @@ msgstr "දාරක නම හිස්ව පවතී!" msgid "The user name is empty!" msgstr "භාවිත නාමය හිස්ව පවතී!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "The password is empty!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "The passwords aren't the same!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "නව භාවිතා කරන්නේක් එක් කරන්න" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "සර්වරයේ සංස්කරණය" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "වරප්‍රසාද ප්‍රතිප්‍රවේශනය කරන්න" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "තෝරාගත් භාවිතා කරන්නන් ඉවත් කරන්න" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "ස්වදේශී" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "ක්‍රියාවලිය" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "බවට දත්තගබඩාවේ නම වෙනස් කරන්න" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "දත්තගබඩාව" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "වෙත දත්තගබඩාව පිටවත් කරන්න" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "අක්ෂර කට්ටලය" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "වගුවේ අවම වශයෙන් එක් ක්ෂේත්‍රයක්වත් තිබිය යුතුයි." - -#: js/messages.php:70 -#, fuzzy -msgid "Create Table" -msgstr "නව පිටුවක් සාදන්න" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "සෙවීම" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "වෙනස් කිරීම් සේව් කරන ලදි" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 #, fuzzy msgid "Relation deleted" msgstr "Relation view" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 #, fuzzy msgid "Internal relation added" msgstr "Internal relations" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "General relation features" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "අක්‍රිය කරන ලද" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "පෙන්වීම සඳහා ක්ෂේත්‍රයක් ‍තෝරාගන්න" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy msgid "Done" msgstr "දත්ත" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "පෙර" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "මීලඟ" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "මුළු එකතුව" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "ද්වීමය" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "මාර්තු" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "අ‍ප්‍රේල්" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "මැයි" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "ජූනි" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "ජූලි" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "අගෝස්තු" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "ඔක්තෝම්බර්" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "ජනවාරි" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "පෙබරවාරි" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "මාර්තු" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "අ‍ප්‍රේල්" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1318,176 +1139,176 @@ msgid "May" msgstr "මැයි" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "ජූනි" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "ජූලි" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "අගෝස්තු" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "සැප්තැම්බර්" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "ඔක්තෝම්බර්" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "නොවැම්බර්" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "දෙසැම්බර්" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "ඉරිදා" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "සදුදා" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "අගහරු‍වදා" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "සිකුරාදා:" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "ඉරිදා" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "සදුදා" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "අගහරු‍වදා" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "බදාදා" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "බ්‍රහස්පතින්දා" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "සිකුරාදා:" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "සෙනසුරාදා" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "ඉරිදා" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "සදුදා" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "අගහරු‍වදා" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "බදාදා" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "බ්‍රහස්පතින්දා" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "සිකුරාදා:" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "සෙනසුරාදා" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "භාවිතා වෙමින් පවතී" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1545,7 +1366,7 @@ msgstr "සූචියන්" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "අනන්‍ය" @@ -1564,7 +1385,7 @@ msgid "Comment" msgstr "විස්තරය" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1587,8 +1408,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "දත්තගබඩා" @@ -1759,11 +1580,7 @@ msgstr "මුරපදය:" msgid "Server Choice" msgstr "සර්වරයේ තේරීම" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "මෙම ස්ථානය පසු කිරීම සඳහා කුකීස් - Cookies සක්‍රිය කල යුතුයි." @@ -1843,11 +1660,7 @@ msgstr "" "Couldn't use either the iconv, libiconv or recode_string functions, although " "the necessary extensions appear to be loaded. Check your PHP configuration." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
If you receive a blank page, everything " "is fine." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Could not load default configuration from: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1885,48 +1690,28 @@ msgstr "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Invalid server index: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "Invalid hostname for server %1$s. Please review your configuration." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "සර්වරය" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Invalid authentication method set in configuration:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Invalid authentication method set in configuration:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "You should upgrade to %s %s or later." @@ -1952,7 +1737,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "ලියකියවිලි" @@ -1966,138 +1751,138 @@ msgstr "SQL විමසුම" msgid "MySQL said: " msgstr "MySQL said: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "SQL ය පහදන්න " -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Skip Explain SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "PHP කේත නොමැතිව" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "PHP කේත සාදන්න" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "අලුත් කරන්න" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Skip Validate SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Validate SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "යන්ත්‍රයන්" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "වේලාව" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "B" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EiB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%B %d, %Y at %I:%M %p" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "දින %s, පැය %s, මිනිත්තු %s සහ තප්පර %s" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Begin" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "පෙර" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "අවසානය‍" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr ""%s" දත්තගබඩාව වෙත යන්න ." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2119,7 +1904,7 @@ msgid "Events" msgstr "යවන ලද" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "නම" @@ -2147,15 +1932,15 @@ msgstr "විමසුම" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "ආනයනය" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "වරප්‍රසාද" @@ -2174,11 +1959,7 @@ msgid "" msgstr "සමහර විට ආසන්න වශයෙන්. FAQ 3.11 බලන්න" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "පිරිවැය" @@ -2195,7 +1976,7 @@ msgstr "සර්වරය ප්‍රතිචාර නොදක්වයි" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(or the local MySQL server's socket is not correctly configured)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2205,36 +1986,22 @@ msgid "Change password" msgstr "මුරපදය වෙනස් කරන්න" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "මුරපදයක් නැත" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "මුරපදය" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "නැවත ටයිප් කරන්න" @@ -2249,20 +2016,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 compatible" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "මුරපදය උත්පාදනය කරන්න" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "උත්පාදනය කරන්න" @@ -2275,17 +2034,23 @@ msgstr "නව දත්තගබඩාවක් සාදන්න" msgid "Create" msgstr "සාදන්න" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "වරප්‍රසාද නොමැත" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "වගුවේ අවම වශයෙන් එක් ක්ෂේත්‍රයක්වත් තිබිය යුතුයි." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "%s දත්තගබඩාවේ නව වගුවක් සාදන්න" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2350,11 +2115,7 @@ msgid "remember template" msgstr "ටෙම්ප්ලේටය මතක තබා ගන්න" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "ගොනුවේ අක්ෂර කට්ටලය:" @@ -2365,7 +2126,7 @@ msgstr "Compression" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "කිසිවක් නැත" @@ -2407,11 +2168,7 @@ msgstr "" msgid "File to import" msgstr "ආනයනය සඳහා වූ ගොනුව" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "පාඨ ගොනුවෙහි පිහිටුම" @@ -2419,20 +2176,12 @@ msgstr "පාඨ ගොනුවෙහි පිහිටුම" msgid "File uploads are not allowed on this server." msgstr "File uploads are not allowed on this server." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "අප්ලෝඩ් කිරීම් සඳහා සැකසූ ඩිරෙක්ටරිය වෙත පිවිසිය නොහැක" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "අන්තර්ජාල සර්වරයේ අප්ලෝඩ් ඩිරෙක්ටරිය" @@ -2567,11 +2316,7 @@ msgstr "යතුර අනුව තෝරන්න" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "මෙහෙයුම්" @@ -2643,14 +2388,14 @@ msgstr "පේළි පෙන්වන්න" msgid "total" msgstr "මුළු එකතුව" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Query took %01.4f sec" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "වෙනස් කරන්න" @@ -2720,11 +2465,7 @@ msgstr "Buffer Pool Usage" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "මුළු එකතුව" @@ -2985,11 +2726,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "ආකෘතිය" @@ -3061,13 +2798,8 @@ msgstr "මෛක්‍රොසොෆ්ට් වර්ඩ් 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "දත්ත" @@ -3116,15 +2848,9 @@ msgstr "MIME වර්ගය" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "දායකයා" @@ -3325,7 +3051,7 @@ msgstr "අපනයන වර්ගය" msgid "Open new phpMyAdmin window" msgstr "Open new phpMyAdmin window" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "වගු නොමැත" @@ -3338,7 +3064,7 @@ msgstr "SQL ප්‍රතිළුල" msgid "Generated by" msgstr "උත්පාදනය කරන ලද්දේ" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL returned an empty result set (i.e. zero rows)." @@ -3489,20 +3215,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "මූලික" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "සූචිය" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "සම්පූර්ණ පාඨය" @@ -3727,6 +3453,10 @@ msgstr "මෙම ආකෘතියේ විකල්ප කිසිවක් msgid "not OK" msgstr "OK නැත" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "සක්‍රිය කරන් ලද" @@ -3749,7 +3479,7 @@ msgid "" msgstr "" "Please see the documentation on how to update your column_comments table" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "පොත් සලකුණු කරන ලද SQL විමසුම" @@ -3800,13 +3530,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "භාවිත නාමය" @@ -3826,22 +3551,14 @@ msgstr "උපතත්වයන් පෙන්වන්න" msgid "Slave status" msgstr "උපතත්වයන් පෙන්වන්න" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Variable" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Value" @@ -3859,40 +3576,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "ඕනෑම භාවිතා කරන්නෙක්" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Use text field" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "ඕනෑම දායකයෙක්" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "ස්වදේශී" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "this host" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "දායක වගුව භාවිතා කරන්න" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3916,7 +3604,6 @@ msgid "Use Host Table" msgstr "දායක වගුව භාවිතා කරන්න" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3950,29 +3637,29 @@ msgstr "%1$s නොදන්නා භාෂාවකි." msgid "Servers" msgstr "සර්වරයන්" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "විචල්‍යනයන්" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "අක්ෂර කට්ටලය" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "යන්ත්‍රයන්" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "ද්වීමය ලොගය" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "ක්‍රියාවලිය" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -4001,51 +3688,51 @@ msgstr "" msgid "Target database" msgstr "දත්තගබඩාවේ සොයන්න" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Run SQL query/queries on server %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Run SQL query/queries on database %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "තීර නම්" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "මෙම SQL විමසුම පොත් සලකුණුගත කරන්න" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "සියලු භාවිතා කරන්නනට මෙම පොත් සලකුණට පිවිසීමට ඉඩ දෙන්න" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "එකම නම ඇති පොත් සලකුණ ප්‍රතිස්ථාපනය කරන්න" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Do not overwrite this query from outside the window" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "පරිසීමකය" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr "මෙම විමසුම මෙහි නැවත පෙන්වන්න " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "ඉදිරිපත් කරන්න" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "දර්ශනය කිරීම පමණි" @@ -4222,13 +3909,13 @@ msgstr "" msgid "Save" msgstr "සේව් කරන්න" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "%s ක්ෂේත්‍ර(යක්) එක් කරන්න" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4427,8 +4114,8 @@ msgstr "ප්‍රතිසකසන්න" msgid "Protocol version" msgstr "ප්‍රෝටකෝල සංස්කරණය" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "භාවිතා කරන්නා" @@ -4873,112 +4560,112 @@ msgstr "ගබඩා යන්ත්‍ර" msgid "View dump (schema) of databases" msgstr "View dump (schema) of databases" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Includes all privileges except GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Allows altering the structure of existing tables." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Allows altering and dropping stored routines." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Allows creating new databases and tables." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Allows creating stored routines." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Allows creating new tables." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Allows creating temporary tables." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Allows creating, dropping and renaming user accounts." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Allows creating new views." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Allows deleting data." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Allows dropping databases and tables." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Allows dropping tables." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Allows executing stored routines." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Allows importing data from and exporting data into files." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Allows adding users and privileges without reloading the privilege tables." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Allows creating and dropping indexes." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Allows inserting and replacing data." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Allows locking tables for the current thread." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Limits the number of new connections the user may open per hour." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Limits the number of queries the user may send to the server per hour." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4986,58 +4673,58 @@ msgstr "" "Limits the number of commands that change any table or database the user may " "execute per hour." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Limits the number of simultaneous connections the user may have." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Has no effect in this MySQL version." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "Allows reloading server settings and flushing the server's caches." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Allows the user to ask where the slaves / masters are." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Needed for the replication slaves." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Allows reading data." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Gives access to the complete list of databases." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Allows performing SHOW CREATE VIEW queries." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Allows shutting down the server." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5047,158 +4734,158 @@ msgstr "" "required for most administrative operations like setting global variables or " "killing threads of other users." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "Allows creating and dropping indexes." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Allows changing data." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "වරප්‍රසාද නොමැත." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "කිසිවක් නැත" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Table-specific privileges" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Note: MySQL privilege names are expressed in English " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "ගෝලීය වරප්‍රසාද" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "දත්තගබඩා විශේෂිත වරප්‍රසාද" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "පරිපාලනය" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "සම්පත් සීමා" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "සටහන: මෙම විකල්පය 0 (බිංදුවට) පත් කිරීම මගින්සීමා ඉවත් වනු ලැ‍‍බේ." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "ලොගින තොරතුරු" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "මුරපදය වෙනස් නොකරන්න" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "No user(s) found." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "%s භාවිතා කරන්නා දැනටමත් පවතී!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "ඔබ නව භාවිතා කරන්නනෙක් එක් කරන ලදි." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "You have updated the privileges for %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "You have revoked the privileges for %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "The password for %s was changed successfully." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "%s ඉවත් කරමින් පවතී" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "ඉවත් කිරීම සඳහා භාවිතා කරන්නන් කිසිවෙක් තෝරාගෙන නොමැත!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Reloading the privileges" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "The selected users have been deleted successfully." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "The privileges were reloaded successfully." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "වරප්‍රසාද සංස්කරණය කරන්න" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Revoke" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "User overview" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "ප්‍රදානය කරන්න" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "ඕනෑම" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "නව භාවිතා කරන්නේක් එක් කරන්න" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "තෝරාගත් භාවිතා කරන්නන් ඉවත් කරන්න" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Revoke all active privileges from the users and delete them afterwards." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "භාවිතා කරන්නන් හා සමාන නම් ඇති දත්තගබඩා හලන්න." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5211,92 +4898,92 @@ msgstr "" "server uses, if they have been changed manually. In this case, you should %" "sreload the privileges%s before you continue." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "The selected user was not found in the privilege table." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Column-specific privileges" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "පහත දත්තගබඩාවට වරප්‍රසාද එක් කරන්න" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "Wildcards % and _ should be escaped with a \\ to use them literally" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "පහත වගුවට වරප්‍රසාද එක් කරන්න" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "ලොගින් තොරතුරු වෙනස් කරන්න / භාවිතා කරන්නා පිටපත් කරන්න" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "සහ එකම වරප්‍රසාද සහිතව නව භාවිතා කරන්නෙක් එක් කරන්න..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... පැරණි එක තබා ගන්න." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... භාවිතා කරන්නන්ගේ වගුවෙන් පැරණි එක ඉවත් කරන්න." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... revoke all active privileges from the old one and delete it afterwards." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr ".. භාවිතා කරන්නන්ගේ වගුවෙන් පැරණි එක ඉවත් කර වරප්‍රසාද නැවත අලුත් කරන්න." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "භාවිතා කරන්නා සඳහා දත්තගබඩාව" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "කිසිවක් නැත" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "එකම නමින් දත්තගබඩාවක සාදා සියලු වරප්‍රසාද එයට දෙන්න" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "අභිමත ආදේශක නාමයන් සඳහා සියලු වරප්‍රසාද දෙන්න (භාවිත නාමය_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr ""%s" දත්තගබඩාව සඳහා වරප්‍රසාද පරීක්ෂා කරන්න." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Users having access to "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "ගෝලීම" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "දත්තගබඩා විශේෂිත" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "wildcard" @@ -8049,26 +7736,26 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 #, fuzzy msgid "Showing SQL query" msgstr "සම්පූර්ණ විමසුම් පෙන්වන්න" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Problems with indexes of table `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "ලේබලය" @@ -8120,13 +7807,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "සහ එවිට" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "පෙර පිටුවට ආපසු යන්න" @@ -8207,7 +7887,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr " %s තීර(ය) සූචියට එක් කරන්න" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Column count has to be larger than zero." @@ -8324,41 +8004,6 @@ msgstr "Check referential integrity:" msgid "Show tables" msgstr "වගු පෙන්වන්න" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "අවකාශ භාවිතය" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "භාවිතය" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Effective" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "පේළි සංඛ්‍ය ලේඛන" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "ප්‍රකාශය" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "ගතික" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "පේළියේ දිග" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "අවකාශ භාවිතය" @@ -8392,7 +8037,6 @@ msgid "Row length" msgstr "පේළියේ දිග" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "පේළියේ ප්‍රමාණය" @@ -8464,50 +8108,50 @@ msgstr "කිසිවක් නැත" msgid "Column %s has been dropped" msgstr "%s වගුව හලන ලදි" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "%s ට මූලික යතුරක් එක් කරන ලදි" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "%s සඳහා සූචියක් එක්කරන ලදි" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Relation view" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Propose table structure" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "%s ක්ෂේත්‍ර(යක්) එක් කරන්න" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "වගුව අවසනදී" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "වගුව මුලදී" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "%s ට පසු" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Create an index on %s columns" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8549,6 +8193,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8945,6 +8593,9 @@ msgstr "වගුව බවට නම වෙනස් කරන්න" #~ msgid "Process list" #~ msgstr "ක්‍රියාවලි ලයිස්තුව" +#~ msgid "Reload privileges" +#~ msgstr "වරප්‍රසාද ප්‍රතිප්‍රවේශනය කරන්න" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/sk.po b/po/sk.po old mode 100755 new mode 100644 index 3b2c46f4d..46a0f363a --- a/po/sk.po +++ b/po/sk.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-30 23:47+0200\n" "Last-Translator: Michal \n" "Language-Team: slovak \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Zobraziť všetko" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Hľadať" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Vykonaj" @@ -114,7 +94,7 @@ msgstr "Použiť túto hodnotu" msgid "Database %1$s has been created." msgstr "Databáza %1$s bola vytvorená." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Komentár k databáze: " @@ -141,17 +121,10 @@ msgstr "Názvy stĺpcov" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Typ" @@ -164,7 +137,7 @@ msgstr "Typ" msgid "Null" msgstr "Nulový" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -188,24 +161,18 @@ msgstr "Linkovať na" msgid "Comments" msgstr "Komentáre" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Nie" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -214,15 +181,9 @@ msgstr "Nie" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -241,143 +202,135 @@ msgstr "Zobraziť dump (schému) databázy" msgid "No tables found in database." msgstr "Neboli nájdené žiadne tabuľky v tejto datábaze." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Označiť všetko" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Odznačiť všetko" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Meno databázy je prázdne!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Databáza %s bola premenovaná na %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Databáza %s bola skopírovaná na %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Premenovať databázu na" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Príkaz" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "a potom" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Skopírovať databázu na" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Iba štruktúru" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Štruktúru a dáta" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Iba dáta" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "Vytvoriť databázu (CREATE DATABASE) pred kopírovaním" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Pridať %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Pridať hodnotu AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Pridať obmedzenia" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Prepnúť na skopírovanú databázu" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Stav" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Zapnuté" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "Vypnuté" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Poškodené" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair" msgctxt "BLOB repository" msgid "Repair" msgstr "Opraviť" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Vypnuté" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "Zapnuté" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Zotriedenie" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -386,14 +339,14 @@ msgstr "" "Prídavné vlastnosti pre prácu s prepojenými tabuľkami boli deaktivované. Ak " "chcete zistiť prečo, kliknite %ssem%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Upraviť PDF Stránky" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -402,11 +355,7 @@ msgstr "Tabuľka" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Riadkov" @@ -414,42 +363,30 @@ msgstr "Riadkov" msgid "Size" msgstr "Veľkosť" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "práve sa používa" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Vytvorenie" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Posledná zmena" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Posledná kontrola" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -511,11 +448,7 @@ msgstr "Zmazať" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "alebo" @@ -549,86 +482,86 @@ msgstr "Použiť tabuľky" msgid "SQL query on database %s:" msgstr " SQL dopyt v databáze %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Odošli dopyt" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Prístup zamietnutý" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "najmenej jedno zo slov" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "všetky slová" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "presný výraz" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "ako regulárny výraz" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Prehľadať výsledky na \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s výskyt(ov)v tabuľke %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Prechádzať" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Zmazať" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Celkovo: %s výskyt(ov)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Hľadať v databáze" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "" "Slovo(á) alebo hodnotu(y), ktoré chcete vyhľadať (nahradzujúci znak: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Nájdi:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Slová sú rozdelené medzerou (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "V tabuľke(ách):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -636,36 +569,36 @@ msgstr "V tabuľke(ách):" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Vložiť" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Štruktúra" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Odstrániť" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Vyprázdniť" @@ -675,117 +608,111 @@ msgstr "Vyprázdniť" msgid "Table %s has been emptied" msgstr "Tabuľka %s bola vyprázdená" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Pohľad %s bol odstránený" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Tabuľka %s bola odstránená" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Pohľad" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replikácia" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Celkom" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "Na tomto MySQL servri je prednastaveným úložným systémom %s." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Výber:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Označiť všetko" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Odznačiť všetko" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Zvoliť neoptimálne" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Náhľad k tlači" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Skontrolovať tabuľku" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimalizovať tabuľku" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Opraviť tabuľku" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analyzovať tabuľku" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Exportovať" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Dátový slovník" @@ -796,10 +723,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -820,8 +747,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Akcia" @@ -857,8 +784,8 @@ msgstr "Iba štruktúru" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Skontrolovať tabuľku" @@ -943,7 +870,7 @@ msgstr "Záznam z obľúbených bol zmazaný." msgid "Showing bookmark" msgstr "Zobrazujem obľúbený príkaz" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Príkaz %s bol zaradený medzi obľúbené" @@ -1027,296 +954,189 @@ msgstr "Názov hostiteľa je prázdny!" msgid "The user name is empty!" msgstr "Meno používateľa je prázdne!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Heslo je prázdne!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Heslá sa nezhodujú!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Pridať nového používateľa" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Vytvoriť relaciu" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Znovunačítať prístupové práva" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Odstrániť vybraných používateľov" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Zrušiť" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Lokálny" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Procesy" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Premenovať databázu na" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Databáza" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Skopírovať databázu na" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Znaková sada" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Tabuľka musí obsahovať aspoň jeden stĺpec." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Vytvoriť tabuľku" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Hľadať" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Zmeny boli uložené" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 #, fuzzy msgid "Relation deleted" msgstr "Zobraziť prepojenia" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 #, fuzzy msgid "Internal relation added" msgstr "Interné vzťahy" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Možnosti všeobecných vzťahov" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Vypnuté" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Zvolte, ktoré pole zobraziť" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "Žiadny" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Predchádzajúci" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Ďalší" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Celkom" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Binárny" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Mar" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Apr" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Máj" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Jún" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Júl" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Aug" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Okt" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Jan" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Feb" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Apr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1324,178 +1144,178 @@ msgid "May" msgstr "Máj" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Jún" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Júl" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Aug" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Sep" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Okt" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Nov" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Dec" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Ne" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Po" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Út" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Pi" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Ne" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Po" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Út" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "St" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Št" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Pi" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "So" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Ne" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Po" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Út" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "St" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Št" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Pi" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "So" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "Wiki" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "práve sa používa" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1552,7 +1372,7 @@ msgstr "Indexy" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unikátny" @@ -1570,7 +1390,7 @@ msgid "Comment" msgstr "Komentár" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1593,8 +1413,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Databázy" @@ -1765,11 +1585,7 @@ msgstr "Heslo:" msgid "Server Choice" msgstr "Voľba serveru" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Cookies musia byť povolené, pokiaľ chcete pokračovať." @@ -1850,11 +1666,7 @@ msgstr "" "Nie je možné použiť funkcie iconv, libiconv a recode_string aj napriek tomu, " "že rozšírenia sú nahrané. Skontrolujte prosím nastavenie PHP." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Ak dostanete iba prázdnu " "stránku, všetko je v poriadku." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Nepodarilo sa načítať prednastavenú konfiguráciu zo súboru: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1892,48 +1696,28 @@ msgstr "" "Direktíva $cfg['PmaAbsoluteUri'] v konfiguračnom súbore MUSÍ byť " "nastavená!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Chybný index serveru: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "Chybný názov hostu pre server %1$s. Prosím, skontrolujte konfiguráciu." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Server" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "V konfigurácii je nastavená nesprávna autentifikačná metóda:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "V konfigurácii je nastavená nesprávna autentifikačná metóda:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Mali by ste aktualizovať %s na verziu %s alebo vyššiu." @@ -1959,7 +1743,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentácia" @@ -1973,138 +1757,138 @@ msgstr "SQL dopyt" msgid "MySQL said: " msgstr "MySQL hlási: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Vysvetliť SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Preskočiť vysvetlenie SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "bez PHP kódu" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Vytvoriť PHP kód" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Obnoviť" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Preskočiť potvrdenie platnosti SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Potvrdiť platnosť SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Systémy" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Čas" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Bajtov" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr " " #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d.%B, %Y - %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s dní, %s hodín, %s minút a %s sekúnd" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Začiatok" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Predchádzajúci" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Koniec" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Na databázu "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "Funkčnosť %s je ovplyvnená známou chybou, pozri %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2123,7 +1907,7 @@ msgid "Events" msgstr "Udalosti" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Názov" @@ -2151,15 +1935,15 @@ msgstr "Dopyt podľa príkladu" msgid "Designer" msgstr "Dizajnér" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Import" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Oprávnenia" @@ -2178,11 +1962,7 @@ msgid "" msgstr "Môže byť nepresné. Pozri FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Naviac" @@ -2199,7 +1979,7 @@ msgstr "Server neodpovedá" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(alebo soket lokálneho MySQL servra nie je správne nastavený)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2209,36 +1989,22 @@ msgid "Change password" msgstr "Zmeniť heslo" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Žiadne heslo" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Heslo" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Potvrdiť" @@ -2253,20 +2019,12 @@ msgid "MySQL 4.0 compatible" msgstr "Kompatibilné s MySQL 4.0" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Vytvoriť Heslo" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Vytvoriť" @@ -2279,17 +2037,23 @@ msgstr "Vytvoriť novú databázu" msgid "Create" msgstr "Vytvoriť" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Žiadne oprávnenia" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Tabuľka musí obsahovať aspoň jeden stĺpec." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Vytvoriť novú tabuľku v databáze %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2355,11 +2119,7 @@ msgid "remember template" msgstr "zapamätať si vzor" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Znaková sada súboru:" @@ -2370,7 +2130,7 @@ msgstr "Kompresia" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Žiadny" @@ -2415,11 +2175,7 @@ msgstr "" msgid "File to import" msgstr "Súbor na importovanie" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Lokácia textového súboru" @@ -2427,20 +2183,12 @@ msgstr "Lokácia textového súboru" msgid "File uploads are not allowed on this server." msgstr "Ukladanie súborov na server nie je povolené." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Adresár určený pre upload súborov sa nedá otvoriť" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "upload adresár web serveru" @@ -2578,11 +2326,7 @@ msgstr "Zoradiť podľa kľúča" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Nastavenia" @@ -2653,14 +2397,14 @@ msgstr "Ukázať záznamy " msgid "total" msgstr "celkovo" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Dopyt zabral %01.4f sek." #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Zmeniť" @@ -2729,11 +2473,7 @@ msgstr "Využitie Vyrovnávacej Pamäte" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Celkom" @@ -2994,11 +2734,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Formát" @@ -3070,13 +2806,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Dáta" @@ -3125,15 +2856,9 @@ msgstr "MIME typ" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Hostiteľ" @@ -3331,7 +3056,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "Otvoriť nové okno phpMyAdmina" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Žiadne tabuľky" @@ -3344,7 +3069,7 @@ msgstr "výsledok SQL" msgid "Generated by" msgstr "Vygenerované" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL vrátil prázdny výsledok (tj. nulový počet riadkov)." @@ -3492,20 +3217,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primárny" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Index" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Celý text" @@ -3730,6 +3455,10 @@ msgstr "Tento formát nemá žiadne nastavenia" msgid "not OK" msgstr "chyba" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Zapnuté" @@ -3753,7 +3482,7 @@ msgstr "" "Prosím prečítajte si dokumentáciu ako aktualizovať tabuľku s informáciami o " "stĺpcoch (Column_comments Table)" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Obľúbený SQL dopyt" @@ -3805,13 +3534,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Meno používateľa" @@ -3830,22 +3554,14 @@ msgstr "Zobraziť stav master replikácie" msgid "Slave status" msgstr "Zobraziť stav podriadených hostov" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Premenná" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Hodnota" @@ -3863,40 +3579,11 @@ msgstr "" msgid "Add slave replication user" msgstr "Pridať replikačného užívateľa pre slave" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Akýkoľvek používateľ" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Požiť textové pole" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Akýkoľvek hostiteľ" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Lokálny" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Tento počítač" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Použiť tabuľku s hostiteľmi" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3920,7 +3607,6 @@ msgid "Use Host Table" msgstr "Použiť tabuľku s hostiteľmi" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3956,29 +3642,29 @@ msgstr "Neznámy jazyk: %1$s." msgid "Servers" msgstr "Servery" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Premenné" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Znakové sady" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Systémy" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Binárny log" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Procesy" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Synchronizovať" @@ -4005,51 +3691,51 @@ msgstr "" msgid "Target database" msgstr "Cieľová databáza" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Spustiť SQL príkaz(y) na servri %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Spustiť SQL dopyt/dopyty na databázu %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Názvy stĺpcov" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Pridať tento SQL dopyt do obľúbených" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Dovoliť používať túto položku všetkým používateľom" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Prepísať existujúci príkaz s rovnakým menom" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Neprepisovať tento dopyt z hlavného okna" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Oddeľovač" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Zobraziť tento dopyt znovu " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Odošli" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Iba prezrieť" @@ -4227,13 +3913,13 @@ msgstr "" msgid "Save" msgstr "Uložiť" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add column(s)" msgid "Add %s column(s)" msgstr "Pridať stĺpec/stĺpce" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4425,8 +4111,8 @@ msgstr "Vynulovať" msgid "Protocol version" msgstr "Verzia protokolu" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Používateľ" @@ -4876,112 +4562,112 @@ msgstr "Úložné Systémy" msgid "View dump (schema) of databases" msgstr "Export databáz" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Všetky oprávnenia okrem GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Povolí meniť štruktúru existujúcich tabuliek." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Umožňuje upravovať a odstraňovať uložené procedúry." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Povolí vytváranie nových databáz a tabuliek." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Umožňuje vytvárať uložené procedúry." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Povolí vytváranie nových tabuliek." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Povolí vytváranie dočasných tabuliek." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Umožňuje vytvárať, odstraňovať a premenovávať používateľské kontá." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Umožňuje vytvárať nové pohľady." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Povolí mazanie dát." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Povolí odstraňovanie databáz a tabuliek." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Povolí odstraňovanie tabuliek." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Umožňuje spúšťať uložené procedúry." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Povolí importovanie a exportovanie dát zo/do súborov na serveri." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "Povolí pridávanie uživatelov a práv bez znovunačítania tabuliek práv." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Povolí vytváranie a mazanie indexov." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Povolí vkladanie a nahradzovanie dát." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Povolí zmaknutie tabuliek pre aktuálne vlákno." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Obmedzí počet nových spojení, ktoré môže používateľ vytvoriť za hodinu." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Obmedzí počet dopytov, ktoré môže používateľ odoslať za hodinu." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4989,60 +4675,60 @@ msgstr "" "Obmedzí počet príkazov meniacich tabuľku alebo databázu, ktorá môže " "používateľ odoslať za hodinu." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Obmedzuje počet simultánnych pripojení používateľa." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Nefunguje v tejto verzii MySQL." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Povolí znovunačítanie nastavení a vyprázdňovanie vyrovnávacích pamätí " "serveru." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Povolí používateľovi zistiť kde je hlavný / pomocný server." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Potrebné pre replikáciu pomocných serverov." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Povolí čítanie dát." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Povolí prístup ku kompletnému zoznamu databáz." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Umožňuje spúšťať príkazy so SHOW CREATE VIEW." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Povolí vypnutie serveru." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5052,159 +4738,159 @@ msgstr "" "Potrebné pre väčšinu operácií pri správe serveru ako nastavovanie globálny " "premenných alebo zabíjanie procesov iných používateľov." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "Povolí vytváranie a mazanie indexov." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Povolí menenie dát." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Žiadne práva." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Žiadny" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Oprávnenia pre jednotlivé tabuľky" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Poznámka: názvy MySQL oprávnení sú uvádzané v angličtine. " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Globálne práva" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Oprávnenia pre jednotlivé databázy" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administrácia" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Obmedzenie zdrojov" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" "Poznámka: Nastavenie týchto parametrov na 0 (nulu) odstráni obmedzenia." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Prihlásenie" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Nezmeniť heslo" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Nebol nájdený žiadny používateľ." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Používateľ %s už existuje!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Používateľ bol pridaný." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Boli aktualizované oprávnenia pre %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Boli zrušené oprávnenia pre %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Heslo pre %s bolo úspešne zmenené." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Odstraňuje sa %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Na odstránenie neboli vybraní žiadni používatelia!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Znovunačítanie práv" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Vybraní používatelia bol úspešne odstránený." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Práva boli úspešne znovunačítané." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Upraviť oprávnenia" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Zrušiť" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Prehľad používatelov" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Prideliť" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Akýkoľvek" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Pridať nového používateľa" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Odstrániť vybraných používateľov" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Odobranie všetkých aktívnych práv používateľom a ich následné odstránenie." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Odstrániť databázy s rovnakým menom ako majú používatelia." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5217,51 +4903,51 @@ msgstr "" "tieto tabuľky ručne upravené. V tomto prípade sa odporúča vykonať %" "sznovunačítanie práv%s predtým ako budete pokračovať." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Zvolený používateľ nebol nájdený v tabuľke práv." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Oprávnenia pre jednotlivé stĺpce" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Pridať oprávnenia pre nasledujúcu databázu" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Náhradzujúcim znakom _ a % by mal predchádzať znak \\, pokiaľ ich nechcete " "použiť doslovne" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Pridať oprávnenia pre nasledujúcu tabuľku" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Zmeniť informácie o používateľovi / Kopírovať používateľa" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Vytvoriť používateľa s rovnakými právami a..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... zachovať pôvodného používateľa." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... zmazať pôvodného používateľa z tabuliek používateľov." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... odobrať všetky oprávnenia pôvodnému používateľovi a následne ho zmazať." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5269,44 +4955,44 @@ msgstr "" " ... zmazať pôvodného používateľa z tabuliek používateľov a potom " "znovunačítať oprávnenia." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Databáza pre používateľa" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Žiadny" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Vytvoriť databázu s rovnakým menom a prideliť všetky oprávnenia" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Prideliť všetky oprávnenia pomocou masky (používateľ_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "Prideliť všetky oprávnenia na databázu "%s"" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Používatelia majúci prístup k "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "globálny" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "závislé na databáze" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "nahradzujúci znak" @@ -8079,25 +7765,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Zobrazujem ako PHP kód" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Zobrazujem SQL dotaz" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Problémy s indexami v tabuľke `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Názov" @@ -8150,13 +7836,6 @@ msgstr "" msgid "Show insert query" msgstr "Zobrazujem SQL dotaz" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "a potom" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Späť" @@ -8237,7 +7916,7 @@ msgstr "(\"PRIMARY\" musí byť iba meno primárneho kľúča!)" msgid "Add to index  %s column(s)" msgstr "Pridať do indexu  %s stĺpec" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Počet stĺpcov musí byť väčší ako nula." @@ -8352,41 +8031,6 @@ msgstr "Skontrolovať referenčnú integritu:" msgid "Show tables" msgstr "Zobraziť tabuľky" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Zabrané miesto" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Využitie" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Efektívny" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Štatistika riadku" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Údaj" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dynamický" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Dĺžka riadku" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Zabrané miesto" @@ -8420,7 +8064,6 @@ msgid "Row length" msgstr "Dĺžka riadku" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Veľkosť riadku " @@ -8492,50 +8135,50 @@ msgstr "Žiadny" msgid "Column %s has been dropped" msgstr "Tabuľka %s bola odstránená" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Bol pridaný primárny kľúč pre %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Bol pridaný index pre %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Zobraziť prepojenia" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Navrhnúť štruktúru tabuľky" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add column(s)" msgid "Add column" msgstr "Pridať stĺpec/stĺpce" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Na konci tabuľky" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Na začiatku tabuľky" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Po %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Vytvoriť index na %s stĺpcoch" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8577,6 +8220,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -9013,6 +8660,9 @@ msgstr "Premenovať tabuľku na" #~ msgid "Process list" #~ msgstr "Zoznam procesov" +#~ msgid "Reload privileges" +#~ msgstr "Znovunačítať prístupové práva" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/sl.po b/po/sl.po old mode 100755 new mode 100644 index 4d9cd2d85..0a004c6fb --- a/po/sl.po +++ b/po/sl.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-06-29 22:42+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" @@ -20,11 +16,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Pokaži vse" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Iskanje" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Izvedi" @@ -114,7 +94,7 @@ msgstr "Uporabi to vrednost" msgid "Database %1$s has been created." msgstr "Podatkovna zbirka %1$s je ustvarjena." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Komentar zbirke podatkov: " @@ -139,17 +119,10 @@ msgstr "Stolpec" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Vrsta" @@ -162,7 +135,7 @@ msgstr "Vrsta" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -186,24 +159,18 @@ msgstr "Povezave z" msgid "Comments" msgstr "Komentarji" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Ne" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -212,15 +179,9 @@ msgstr "Ne" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -239,135 +200,127 @@ msgstr "Preglej povzetek stanja podatkovne zbirke" msgid "No tables found in database." msgstr "V podatkovni zbirki ni mogoče najti tabel." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Izberi vse" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Prekliči izbor vsega" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Ime podatkovne zbirke je prazno!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Zbirka podatkov %s je preimenovana v %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Zbirka podatkov %s je kopirana v %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Preimenuj zbirko podatkov v" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Ukaz" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "in potem" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Kopiraj zbirko podatkov v" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Samo struktura" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Struktura in podatki" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Samo podatki" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREATE DATABASE pred kopiranjem" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Dodaj %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Dodaj vrednost AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Dodaj omejitve" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Preklopi na kopirano podatkovno zbirko" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "Shramba BLOB" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Stanje" -#: db_operations.php:559 +#: db_operations.php:548 msgctxt "BLOB repository" msgid "Enabled" msgstr "Omogočeno" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Onemogoči" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Poškodovano" -#: db_operations.php:577 +#: db_operations.php:566 msgctxt "BLOB repository" msgid "Repair" msgstr "Popravi" -#: db_operations.php:585 +#: db_operations.php:574 msgctxt "BLOB repository" msgid "Disabled" msgstr "Onemogočeno" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Omogoči" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Pravilo za razvrščanje znakov" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -376,14 +329,14 @@ msgstr "" "Dodatne funkcije za delo s povezanimi tabelami so bile izkjučene. Če želite " "izvedeti zakaj, kliknite %stukaj%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Uredi PDF strani" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -392,11 +345,7 @@ msgstr "Tabela" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "vrstic" @@ -404,42 +353,30 @@ msgstr "vrstic" msgid "Size" msgstr "Velikost" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "v uporabi" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Ustvarjeno" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Zadnjič posodobljeno" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Zadnjič pregledano" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, php-format msgid "%s table" msgid_plural "%s tables" @@ -501,11 +438,7 @@ msgstr "Briši" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Ali" @@ -535,120 +468,120 @@ msgstr "Uporabi tabele" msgid "SQL query on database %s:" msgstr "Poizvedba SQL na zbirki podatkov %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Izvedi poizvedbo" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Dostop zavrnjen" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "katerokoli besedo" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "vse besede" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "točno določeno frazo" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "kot običajni izraz (regular expression)" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Rezultati iskanja \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s zadetek(ov) v tabeli %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Prebrskaj" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Izbriši" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Skupaj: %s zadetek(ov)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Išči v podatkovni zbirki" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Iskane besede ali vrednosti (nadomestni znak: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Najdi:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Besede so ločene s presledkom (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "V tabelah:" -#: db_search.php:367 +#: db_search.php:355 msgid "Inside column:" msgstr "V stolpcu:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Vstavi" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Struktura" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Zavrzi" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Izprazni" @@ -658,117 +591,111 @@ msgstr "Izprazni" msgid "Table %s has been emptied" msgstr "Tabela %s je izpraznjena" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Pogled %s je zavržen" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Tabela %s je zavržena" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "Sledenje je aktivno." -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "Sledenje ni aktivno." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "Pogled ima vsaj toliko vrstic. Prosimo, oglejte si %sdokumentacijo%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Pogled" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Podvojevanje" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Vsota" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s je privzet skladiščni pogon na tem strežniku MySQL." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Z označenim:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Označi vse" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Odznači vse" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Preveri prekoračene" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Pogled za tiskanje" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Preveri tabelo" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimiraj tabelo" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Popravi tabelo" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analiziraj tabelo" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Izvozi" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Slovar podatkov" @@ -779,10 +706,10 @@ msgstr "Sledene tabele" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -802,8 +729,8 @@ msgstr "Posodobljeno" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Dejanje" @@ -837,8 +764,8 @@ msgstr "Posnetek strukture" msgid "Untracked tables" msgstr "Nesledene tabele" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "Sledi tabeli" @@ -921,7 +848,7 @@ msgstr "Zaznamek je odstranjen." msgid "Showing bookmark" msgstr "Prikazovanje zaznamka" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Zaznamek %s je ustvarjen" @@ -1007,425 +934,316 @@ msgstr "Ime gostitelja je prazno!" msgid "The user name is empty!" msgstr "Uporabniško ime je prazno!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Geslo je prazno!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Gesli se ne ujemata!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Dodaj novega uporabnika" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create version" -msgid "Create User" -msgstr "Ustvari različico" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reloading the privileges" -msgid "Reloading Privileges" -msgstr "Osvežujem privilegije" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Izbriši izbrane uporabnike" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "Zapri" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Prekliči" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Naloži" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Procesi" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "V redu" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Preimenuj zbirko podatkov v" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Podatkovna zbirka" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Kopiraj zbirko podatkov v" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Nabor znakov" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one column." -msgid "Table must have atleast 1 column" -msgstr "Tabele morajo imeti vsaj en stolpec." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Ustvari tabelo" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Iskanje" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Spremembe so shranjene" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Relacija je izbrisana" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "Dodano razmerje FOREIGN KEY" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Dodana notranja razmerja" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Napaka: Razmerje ni dodano." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Napaka: razmerje že obstaja." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Napaka pri shranjevanju koordinat Oblikovalnika." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Splošne lastnosti relacij" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Onemogočeno" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Izberite referenčni ključ" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Izberite tuji ključ" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Prosimo, izberite primarni ključ ali unikatni ključ" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 msgid "Choose column to display" msgstr "Izberite stolpec za prikaz" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 msgid "Done" msgstr "Končano" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 msgid "Prev" msgstr "Prejšnji" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Naslednji" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 msgid "Today" msgstr "Danes" -#: js/messages.php:111 +#: js/messages.php:82 msgid "January" msgstr "januar" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "februar" -#: js/messages.php:113 +#: js/messages.php:84 msgid "March" msgstr "marec" -#: js/messages.php:114 +#: js/messages.php:85 msgid "April" msgstr "april" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "maj" -#: js/messages.php:116 +#: js/messages.php:87 msgid "June" msgstr "junij" -#: js/messages.php:117 +#: js/messages.php:88 msgid "July" msgstr "julij" -#: js/messages.php:118 +#: js/messages.php:89 msgid "August" msgstr "avgust" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "september" -#: js/messages.php:120 +#: js/messages.php:91 msgid "October" msgstr "oktober" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "november" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "december" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "jan" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "feb" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "apr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 msgctxt "Short month name" msgid "May" msgstr "maj" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "jun" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "jul" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "avg" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "sep" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "okt" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "nov" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "dec" -#: js/messages.php:151 +#: js/messages.php:122 msgid "Sunday" msgstr "nedelja" -#: js/messages.php:152 +#: js/messages.php:123 msgid "Monday" msgstr "ponedeljek" -#: js/messages.php:153 +#: js/messages.php:124 msgid "Tuesday" msgstr "torek" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "sreda" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "četrtek" -#: js/messages.php:156 +#: js/messages.php:127 msgid "Friday" msgstr "petek" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "sobota" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "ned" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "pon" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "tor" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "sre" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "čet" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "pet" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "sob" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 msgid "Su" msgstr "ne" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 msgid "Mo" msgstr "po" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 msgid "Tu" msgstr "to" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 msgid "We" msgstr "sr" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 msgid "Th" msgstr "če" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 msgid "Fr" msgstr "pe" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 msgid "Sa" msgstr "so" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "ted." -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "Ura" -#: js/messages.php:194 +#: js/messages.php:165 msgid "Minute" msgstr "Minuta" -#: js/messages.php:195 +#: js/messages.php:166 msgid "Second" msgstr "Sekunda" @@ -1484,7 +1302,7 @@ msgstr "Indeksi" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Edinstven" @@ -1502,7 +1320,7 @@ msgid "Comment" msgstr "Komentar" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1527,8 +1345,8 @@ msgstr "" "Kaže, da sta indeksa %1$s in %2$s enaka, zato se enega od njiju morda lahko " "odstrani." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Podatkovne zbirke" @@ -1702,11 +1520,7 @@ msgstr "Geslo:" msgid "Server Choice" msgstr "Izbira strežnika" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Če želite še dalje uporabljati program, morate omogočiti piškotke." @@ -1787,11 +1601,7 @@ msgstr "" "Ni mogoče uporabljati funkcij iconv, libiconv ali recode_string, čeprav so " "potrebne razširitve normalno naložene. Preverite vašo konfiguracijo PHP." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Če dobite " "prazno stran, je vse v redu." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "Ne morem naložiti privzete konfiguracije iz: %1$s" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1828,49 +1630,29 @@ msgstr "" "Ukaz $cfg['PmaAbsoluteUri'] MORA biti določen v konfiguracijski " "datoteki!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "Neveljaven indeks strežnika: %s" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" "Neveljavno ime gostitelja za strežnik %1$s. Prosim, preglejte svojo " "konfiguracijo." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Strežnik" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Neveljaven način overitve določen v konfiguracijski datoteki:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Neveljaven način overitve določen v konfiguracijski datoteki:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "%s bi morali nadgraditi v verzijo %s ali novejšo." @@ -1896,7 +1678,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentacija" @@ -1910,136 +1692,136 @@ msgstr "Poizvedba SQL" msgid "MySQL said: " msgstr "MySQL je vrnil: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Razloži stavek SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Preskoči razlago stavka SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "Brez kode PHP" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Ustvari kodo PHP" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Osveži" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Preskoči preverjanje pravilnosti SQL stavka" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Preveri pravilnost stavka SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "Urejanje te poizvedbe v vrstici" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "V vrstici" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Profiliranje" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Čas" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "B" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EiB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "." #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d %B %Y ob %H.%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s dni, %s ur, %s minut in %s sekund" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Začetek" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Prejšnji" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Konec" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Preskoči na podatkovno zbirko "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "Na funkcionalnost %s vpliva znan hrošč, glej %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2060,7 +1842,7 @@ msgid "Events" msgstr "Dogodki" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Ime" @@ -2088,15 +1870,15 @@ msgstr "Poizvedba" msgid "Designer" msgstr "Oblikovalnik" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Uvozi" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privilegiji" @@ -2117,11 +1899,7 @@ msgstr "" "3.11[/a]" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Presežek" @@ -2140,7 +1918,7 @@ msgstr "Strežnik se ne odziva" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(ali pa lokalna vtičnica strežnika MySQL ni pravilno konfigurirana)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Podrobnosti ..." @@ -2150,36 +1928,22 @@ msgid "Change password" msgstr "Spremeni geslo" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Brez gesla" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Geslo" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Ponovno vnesi" @@ -2192,20 +1956,12 @@ msgid "MySQL 4.0 compatible" msgstr "Združljivo z MySQL 4.0" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Ustvari geslo" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Ustvari" @@ -2218,17 +1974,21 @@ msgstr "Ustvari novo zbirko podatkov" msgid "Create" msgstr "Ustvari" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Brez privilegijev" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +msgid "Table must have at least one column." +msgstr "Tabele morajo imeti vsaj en stolpec." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Ustvari novo tabelo v podatkovni zbirki %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 msgid "Number of columns" msgstr "Število stolpcev" @@ -2291,11 +2051,7 @@ msgid "remember template" msgstr "shrani predlogo" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Nabor znakov datoteke:" @@ -2306,7 +2062,7 @@ msgstr "Stiskanje" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Brez" @@ -2353,11 +2109,7 @@ msgstr "" msgid "File to import" msgstr "Datoteka za uvoz" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Mesto datoteke z besedilom" @@ -2365,20 +2117,12 @@ msgstr "Mesto datoteke z besedilom" msgid "File uploads are not allowed on this server." msgstr "Nalaganje datotek na tem strežniku ni dovoljeno." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Imenik, ki ste ga določili za nalaganje, je nedosegljiv" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "imenik za nalaganje datotek" @@ -2510,11 +2254,7 @@ msgstr "Uredi po ključu" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Možnosti" @@ -2582,14 +2322,14 @@ msgstr "Prikazujem vrstice" msgid "total" msgstr "skupaj" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Poizvedba je potrebovala %01.4f s" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Spremeni" @@ -2659,11 +2399,7 @@ msgstr "Uporaba zaloge medpomnilnika" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Skupaj" @@ -2950,11 +2686,7 @@ msgstr "" "bo naslednja najvišja številka." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Oblika" @@ -3018,13 +2750,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Podatki" @@ -3073,15 +2800,9 @@ msgstr "Vrsta MIME" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Gostitelj" @@ -3274,7 +2995,7 @@ msgstr "Izvozi vsebine" msgid "Open new phpMyAdmin window" msgstr "Odpri novo okno phpMyAdmin" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "Nova tabela" @@ -3286,7 +3007,7 @@ msgstr "Rezultat SQL" msgid "Generated by" msgstr "Ustvaril" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL je vrnil kot rezultat prazno množico (npr. nič vrstic)." @@ -3434,20 +3155,20 @@ msgstr "Pretvori v kano" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primarni" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Indeks" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Polno besedilo" @@ -3672,6 +3393,10 @@ msgstr "Za to obliko ni možnosti" msgid "not OK" msgstr "ni v redu" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "V redu" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Omogočeno" @@ -3693,7 +3418,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "Navodila za posodobitev tabele column_comments najdete v dokumentaciji" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Označena poizvedba SQL" @@ -3751,13 +3476,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Uporabniško ime" @@ -3774,22 +3494,14 @@ msgstr "Stanje glavnega strežnika" msgid "Slave status" msgstr "Stanje podrejenca" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Spremenljivka" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Vrednost" @@ -3809,40 +3521,11 @@ msgstr "" msgid "Add slave replication user" msgstr "Dodaj uporabnika podvojevanja podrejencev" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Kateri koli uporabnik" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Uporabi besedilno polje" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Kateri koli gostitelj" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Lokalno" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Ta strežnik" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Uporabi tabelo gostiteljev" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3866,7 +3549,6 @@ msgid "Use Host Table" msgstr "Uporabi tabelo gostiteljev" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3902,29 +3584,29 @@ msgstr "Neznani jezik: %1$s." msgid "Servers" msgstr "Strežniki" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Spremenljivke" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Nabori znakov" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Pogoni" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Dvojiški dnevnik" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Procesi" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Sinhroniziraj" @@ -3951,49 +3633,49 @@ msgstr "Razlika" msgid "Target database" msgstr "Ciljna zbirka podatkov" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Izvedi poizvedbo/poizvedbe SQL na strežniku %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Izvedi poizvedbo/poizvedbe SQL na podatkovni zbirki %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 msgid "Columns" msgstr "Stolpci" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Označi to poizvedbo SQL" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Dovoli dostop do zaznamka vsem uporabnikom" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Zamenjaj obstoječ zaznamek z istim imenom" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Ne prepiši te poizvedbe od zunaj" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Ločilo" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Ponovno pokaži poizvedbo v tem oknu " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Pošlji" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Samo pogled" @@ -4162,12 +3844,12 @@ msgstr "Definicija PARTITION" msgid "Save" msgstr "Shrani" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, php-format msgid "Add %s column(s)" msgstr "Dodaj %s stolpec(-cev)" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 msgid "You have to add at least one column." msgstr "Dodati morate vsaj en stolpec." @@ -4337,8 +4019,8 @@ msgstr "Ponastavi" msgid "Protocol version" msgstr "Različica protokola" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Uporabnik" @@ -4781,113 +4463,113 @@ msgstr "Pogoni skladiščenja" msgid "View dump (schema) of databases" msgstr "Pokaži povzetek stanja podatkovnih baz" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Vsebuje vse privilegije razen GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Omogoča spreminjanje strukture obstoječih tabel." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Omogoča ustvarjanje in brisanje shranjenih rutin." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Omogoča ustvarjanje novih podatkovnih zbirk in tabel." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Omogoča ustvarjanje shranjenih rutin." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Omogoča ustvarjanje novih tabel." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Omogoča ustvarjanje začasnih tabel." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Omogoča ustvarjanje, brisanje in preimenovanje uporabniških računov." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Omogoča ustvarjanje novih pogledov." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Omogoča brisanje podatkov." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Omogoča brisanje podatkovnih zbirk in tabel." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Omogoča brisanje tabel." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Omogoča določanje dogodkov za načrtovalnik dogodkov" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Omogoča izvajanje shranjenih rutin." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Omogoča uvažanje in izvažanje podatkov v datoteke." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Omogoča dodajanje uporabnikov in privilegijev brez osveževanja privilegijev." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Omogoča ustvarjanje in brisanje indeksov." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Omogoča vstavljanje in zamenjavo podatkov." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Omogoča zaklepanje tabel za trenutno temo." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Omeji število povezav, ki jih uporabnik lahko odpre v eni uri." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Omeji število poizved, ki jih uporabnik lahko pošlje strežniku v eni uri." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4895,62 +4577,62 @@ msgstr "" "Omeji število ukazov za spremembo tabel ali podatkovne zbirke, ki jih " "uporabnik lahko izvrši v eni uri." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Omeji število sočasnih povezav, ki jih lahko ima uporabnik." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Omogoča ogled procesov vseh uporabnikov" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "V tej različici MySQL nima pomena." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Omogoča osveževanje strežnikovih nastavitev in praznjenje strežnikovih " "predpomnilnikov." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" "Da uporabniku pravico poizvedovati kje so njegovi nadrejeni / podrjeni " "strežniki." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Potrebno za podrejene strežnike pri replikaciji." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Omogoča branje podatkov." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Omogoča dostop do popolnega spiska podatkovnih zbirk." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Omogoča izvajanje poizvedb SHOW CREATE VIEW." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Omogoča ugašanje strežnika." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -4960,153 +4642,153 @@ msgstr "" "priklopov; Potrebno za večino administrativnih nalog kot sta postavljanje " "globalnih spremenljivk in ukinjanje procesov drugih uporabnikov." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Omogoča ustvarjanje in brisanje sprožilcev" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Omogoča spreminjanje podatkov." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Brez privilegijev." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 msgctxt "None privileges" msgid "None" msgstr "Brez" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Privilegiji tipični za tabelo" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Opomba: Imena privilegijev MySQL so zapisana v angleščini " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Globalni privilegiji" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Privilegiji tipični za podatkovno zbirko" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administracija" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Omejitve virov" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" "Obvestilo: Če postavite vrednost na 0 (nič), boste odstranili omejitev." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Podatki o prijavi" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Ne spreminjaj gesla" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 msgid "No user found." msgstr "Najden ni bil noben uporabnik." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Uporabnik %s že obstaja!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Dodali ste novega uporabnika." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Posodobili ste privilegije za %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Odvzeli ste privilegije za %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Geslo za %s je uspešno spremenjeno." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Brišem %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Ni izbranih uporabnikov za brisanje!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Osvežujem privilegije" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Uspešno sem izbrisal izbrane uporabnike." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Uspešno sem osvežil privilegije." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Uredi privilegije" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Odvzemi" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Pregled uporabnikov" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Dovoli" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Kateri koli" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Dodaj novega uporabnika" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Izbriši izbrane uporabnike" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Odvzemi uporabnikom aktivne privilegije in jih potem izbriši." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Izbriši podatkovne zbirke, ki imajo enako ime kot uporabniki." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5119,50 +4801,50 @@ msgstr "" "jih uporablja strežnik, če so bile tabele ročno spremenjene. V tem primeru " "morate pred nadaljevanjem %sosvežiti privilegije%s." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Izbranega uporabnika v tabelah privilegijev nisem našel." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Privilegiji tipični za stolpec" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Dodaj privilegije na naslednji podatkovni zbirki" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Pred nadomestna znaka % in _ je potrebno postaviti \\, če ju želite " "uporabiti dobesedno." -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Dodaj privilegije na naslednji tabeli" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Spremeni prijavne informacije / Kopiraj uporabnika" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Ustvari novega uporabnika z enakimi pravicami in ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... obdrži starega." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... izbriši starega s seznama uporabnikov." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... prekliči vse aktivne pravice starega uporabnika ter jih izbriši." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5170,43 +4852,43 @@ msgstr "" " ... izbriši starega uporabnika s seznama uporabnikov ter ponovno naloži " "njegove pravice." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Podatkovna zbirka za uporabnika" -#: server_privileges.php:2060 +#: server_privileges.php:2037 msgctxt "Create none database for user" msgid "None" msgstr "Nobena" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Ustvari zbirko podatkov z enakim imenom in dodeli vse privilegije" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" "Dodeli vse privilegije na imenu z nadomestnim znakom (uporabniskoime\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "Dodeli vse privilegije za podatkovno zbirko "%s"" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Uporabniški dostop do "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "globalno" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "glede na zbirko podatkov" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "nadomestni znak" @@ -8110,25 +7792,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "Id vstavljene vrstice: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Prikazovanje kot koda PHP" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Prikazovanje poizvedbe SQL" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Težave z indeksi tabele `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Oznaka" @@ -8178,13 +7860,6 @@ msgstr "Vstavi kot novo vrstico in presliši napake" msgid "Show insert query" msgstr "Prikaži poizvedbo insert" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "in potem" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Nazaj na prejšnjo stran" @@ -8265,7 +7940,7 @@ msgstr "(\"PRIMARY\" mora biti ime samo primarnega ključa!)" msgid "Add to index  %s column(s)" msgstr "Dodaj indeksu  %s stolpec(ce)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Število stolpcev mora biti večje od nič." @@ -8377,41 +8052,6 @@ msgstr "Preveri referenčno integriteto:" msgid "Show tables" msgstr "Pokaži tabele" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Poraba prostora" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Uporaba" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Učinkovito" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Statistika vrstic" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Izjave" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "statično" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinamično" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Dolžina vrstice" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Poraba prostora" @@ -8445,7 +8085,6 @@ msgid "Row length" msgstr "Dolžina vrstice" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Velikost vrstice " @@ -8511,47 +8150,47 @@ msgstr "Brez" msgid "Column %s has been dropped" msgstr "Stolpec %s je zavržen" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Na %s je dodan primarni ključ" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Na %s je dodan indeks" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Pogled relacij" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Predlagaj strukturo tabele" -#: tbl_structure.php:538 +#: tbl_structure.php:540 msgid "Add column" msgstr "Dodaj stolpec" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Na koncu tabele" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Na začetku tabele" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Po %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, php-format msgid "Create an index on  %s columns" msgstr "Ustvari indeks na  %s stolpcih" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "po particijah" @@ -8597,6 +8236,10 @@ msgstr "" "Stavki SQL so bili izvoženi. Prosimo, skopirajte odložene podatke ali jih " "izvršite." +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "Zapri" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/sq.po b/po/sq.po old mode 100755 new mode 100644 index 3e4e23ef8..58432b70b --- a/po/sq.po +++ b/po/sq.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-05-19 13:02+0200\n" "Last-Translator: Laurent \n" "Language-Team: albanian \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Shfaqi të gjithë" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Kërko" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Zbato" @@ -114,7 +94,7 @@ msgstr "Përdor këtë vlerë" msgid "Database %1$s has been created." msgstr "U krijua baza e të dhënave %1$s." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Komenti për databazën: " @@ -141,17 +121,10 @@ msgstr "Emrat e kollonave" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Lloji" @@ -164,7 +137,7 @@ msgstr "Lloji" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -188,24 +161,18 @@ msgstr "Lidhje me" msgid "Comments" msgstr "Komente" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr " Jo " -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -214,15 +181,9 @@ msgstr " Jo " #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -241,135 +202,127 @@ msgstr "Shfaq dump (skema) e databazës" msgid "No tables found in database." msgstr "Nuk gjenden tabela në databazë." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Zgjidh gjithçka" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Asnjë zgjedhje" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Mungon emri i databazës!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Databazës %s i është ndryshuar emri në %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Databaza %s është kopjuar tek %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Ndysho emrin e databazës në" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Komanda" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Kopjo databazën në" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Vetëm struktura" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Struktura dhe të dhënat" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Vetëm të dhënat" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREATE DATABASE para se të kopjohet" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Shto %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Shto vlerë AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Shto kushte" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Kalo tek databaza e kopjuar" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "Repository BLOB" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Gjendja" -#: db_operations.php:559 +#: db_operations.php:548 msgctxt "BLOB repository" msgid "Enabled" msgstr "Aktivizuar" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Çaktivizo" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Me dëme" -#: db_operations.php:577 +#: db_operations.php:566 msgctxt "BLOB repository" msgid "Repair" msgstr "Riparo" -#: db_operations.php:585 +#: db_operations.php:574 msgctxt "BLOB repository" msgid "Disabled" msgstr "Çaktivizuar" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Aktivizo" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Collation" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -378,14 +331,14 @@ msgstr "" "Karakteristikat shtesë janë çaktivizuar për sa i takon funksionimit me " "tabelat e lidhura. Për të kuptuar përse, klikoni %skëtu%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Ndrysho faqet PDF" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -394,11 +347,7 @@ msgstr "Tabela" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "rreshta" @@ -406,42 +355,30 @@ msgstr "rreshta" msgid "Size" msgstr "Madhësia" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "në përdorim" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Krijimi" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Ndryshimi i fundit" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Kontrolli i fundit" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -502,11 +439,7 @@ msgstr "Fshi" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Ose" @@ -540,85 +473,85 @@ msgstr "Përdor tabelat" msgid "SQL query on database %s:" msgstr "Kërkesë SQL tek databaza %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Dërgo Query" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Ndalohet hyrja" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "të paktën një prej fjalëve" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "të gjitha fjalët" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "frazën e saktë" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "si shprehje e rregullt" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Rezultatet e kërkimit për \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s korrispondon(jnë) tek tabela %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Shfleto" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Fshi" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Gjithsej: %s korrispondues(ë)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Kërko në databazë" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Fjala(ë) apo vlera(at) për t'u kërkuar (karakteri Jolly: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Gjej:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Fjalët veçohen me anë të një hapësirë bosh (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Tek tabela(at):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -626,36 +559,36 @@ msgstr "Tek fusha:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Shto" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Struktura" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Elemino" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Zbraz" @@ -665,118 +598,112 @@ msgstr "Zbraz" msgid "Table %s has been emptied" msgstr "Tabela %s u zbraz" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Paraqitja %s u eleminua" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Tabela %s u eleminua" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "Gjurmimi është aktiv." -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "Gjurmimi nuk është aktiv." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Paraqitje" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replikimi" -#: db_structure.php:487 +#: db_structure.php:489 #, fuzzy msgid "Sum" msgstr "Sum" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "" -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "N.q.s. të zgjedhur:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Zgjidh gjithçka" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Asnjë zgjedhje" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Zgjidh të mbingarkuarit" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Shfaq për printim" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Kontrollo tabelën" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimizo tabelën" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Riparo tabelën" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analizo tabelën" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Eksporto" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 #, fuzzy msgid "Data Dictionary" msgstr "Data Dictionary" @@ -788,10 +715,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -812,8 +739,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Veprimi" @@ -849,8 +776,8 @@ msgstr "Vetëm struktura" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Kontrollo tabelën" @@ -927,7 +854,7 @@ msgstr "Libërshënuesi u fshi." msgid "Showing bookmark" msgstr "" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "" @@ -1006,295 +933,189 @@ msgstr "Emri i host është bosh!" msgid "The user name is empty!" msgstr "Emri i përdoruesit është bosh!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Fjalëkalimi është bosh!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Fjalëkalimi nuk korrispondon!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Shto një përdorues të ri" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Versioni i MySQL" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reloading the privileges" -msgid "Reloading Privileges" -msgstr "Duke ringarkuar të drejtat" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Heq përdoruesit e zgjedhur" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Lokal" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Proceset" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Ndysho emrin e databazës në" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Databazat" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Kopjo databazën në" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Familje gërmash" - -#: js/messages.php:69 -#, fuzzy -#| msgid "You have to choose at least one column to display" -msgid "Table must have atleast 1 column" -msgstr "Zgjidh të paktën një kollonë për të shfaqur" - -#: js/messages.php:70 -#, fuzzy -msgid "Create Table" -msgstr "Krijo një faqe të re" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Kërko" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Ndryshimet u ruajtën" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 #, fuzzy msgid "Relation deleted" msgstr "Shiko relacionet" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 #, fuzzy msgid "Internal relation added" msgstr "Relacione të brendshme" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Karakteristikat e përgjithshme të relacionit" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Jo aktiv" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Zgjidh fushën që dëshiron të shohësh" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "Asnjë lloj" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Paraardhësi" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Në vazhdim" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Gjithsej" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Binar" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Mar" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Pri" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Maj" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Qer" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Kor" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Gsh" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Tet" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Jan" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Shk" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Pri" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1302,176 +1123,176 @@ msgid "May" msgstr "Maj" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Qer" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Kor" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Gsh" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Sht" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Tet" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Nën" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Dhj" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Djl" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Hën" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Mar" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Pre" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Djl" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Hën" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Mar" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Mër" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Enj" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Pre" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sht" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Djl" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Hën" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Mar" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Mër" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Enj" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Pre" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Sht" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "në përdorim" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1528,7 +1349,7 @@ msgstr "Tregues" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "I vetëm" @@ -1547,7 +1368,7 @@ msgid "Comment" msgstr "Komente" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1570,8 +1391,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Databazat" @@ -1739,11 +1560,7 @@ msgstr "Fjalëkalimi:" msgid "Server Choice" msgstr "Zgjedhja e serverit" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Nga kjo pikë e tutje, cookies duhet të jenë të aktivuara." @@ -1823,11 +1640,7 @@ msgstr "" "I pamundur përdorimi i funksioneve iconv apo libiconv apo recode_string për " "shkak se ekstensioni duhet të ngarkohet. Kontrolloni konfigurimin e php." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Nëse faqja që " "do t'ju hapet është bosh (e bardhë), atëhere gjithçka është në rregull." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1864,47 +1669,27 @@ msgstr "" "Direktiva $cfg['PmaAbsoluteUri'] DUHET të përcaktohet tek file i " "konfigurimit!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Serveri" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Duhet të instaloni %s %s ose superior." @@ -1930,7 +1715,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentet" @@ -1944,136 +1729,136 @@ msgstr "query SQL" msgid "MySQL said: " msgstr "Mesazh nga MySQL: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Shpjego SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Mos shpjego SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "pa kod PHP" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Krijo kodin PHP" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Rifresko" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Mos vleftëso SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Vleftëso SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Koha" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Bytes" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "." #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d %B, %Y at %I:%M %p" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s ditë, %s orë, %s minuta dhe %s sekonda" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Fillim" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Paraardhësi" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Fund" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Kalo tek databaza "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2093,7 +1878,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Emri" @@ -2121,16 +1906,16 @@ msgstr "Query nga shembull" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 #, fuzzy msgid "Import" msgstr "Eksporto" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Të drejtat" @@ -2149,11 +1934,7 @@ msgid "" msgstr "" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Mbi limit" @@ -2170,7 +1951,7 @@ msgstr "Serveri nuk përgjigjet" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2180,36 +1961,22 @@ msgid "Change password" msgstr "Ndrysho fjalëkalimin" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Asnjë fjalëkalim" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Fjalëkalimi" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Rifut" @@ -2222,20 +1989,12 @@ msgid "MySQL 4.0 compatible" msgstr "" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master #, fuzzy msgid "Generate" msgstr "Gjeneruar nga" @@ -2249,17 +2008,23 @@ msgstr "Krijo një databazë të re" msgid "Create" msgstr "Krijo" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Asnjë e drejtë" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "You have to choose at least one column to display" +msgid "Table must have at least one column." +msgstr "Zgjidh të paktën një kollonë për të shfaqur" + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Krijo një tabelë të re tek databaza %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of rows per page" msgid "Number of columns" @@ -2322,11 +2087,7 @@ msgid "remember template" msgstr "kujto template" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Familja gërmave të file:" @@ -2337,7 +2098,7 @@ msgstr "Kompresim" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Asnjë lloj" @@ -2379,11 +2140,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Pozicioni i file" @@ -2391,20 +2148,12 @@ msgstr "Pozicioni i file" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Directory që keni zgjedhur për upload nuk arrin të gjehet" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "directory e upload të server-it web" @@ -2533,11 +2282,7 @@ msgstr "Rendit sipas kyçit" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "Operacione" @@ -2609,14 +2354,14 @@ msgstr "Shfaqja e regjistrimeve " msgid "total" msgstr "Gjithsej" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Query ka zgjatur %01.4f sec" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Ndrysho" @@ -2684,11 +2429,7 @@ msgstr "" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Gjithsej" @@ -2934,11 +2675,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Formati" @@ -3010,13 +2747,8 @@ msgstr "" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Të dhëna" @@ -3065,15 +2797,9 @@ msgstr "Lloji MIME" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Host" @@ -3273,7 +2999,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Asnjë tabelë" @@ -3286,7 +3012,7 @@ msgstr "Rezultati SQL" msgid "Generated by" msgstr "Gjeneruar nga" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL ka kthyer një të përbashkët boshe (p.sh. zero rreshta)." @@ -3433,20 +3159,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primar" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Treguesi" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Teksti komplet" @@ -3672,6 +3398,10 @@ msgstr "Ky format nuk ka opcione" msgid "not OK" msgstr "jo OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Aktiv" @@ -3694,7 +3424,7 @@ msgid "" msgstr "" "Ju lutem lexoni dokumentet mbi rifreskimin e tabelës suaj Column_comments" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Query SQL shtuar të preferuarve" @@ -3745,13 +3475,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Emri i përdoruesit" @@ -3769,22 +3494,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "E ndryshueshme" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Vlerë" @@ -3803,40 +3520,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Çfarëdo përdorues" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Përdor fushë teksti" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Çfarëdo host" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Lokal" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Këtë Host" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Përdor Tabelën e Host-it" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3860,7 +3548,6 @@ msgid "Use Host Table" msgstr "Përdor Tabelën e Host-it" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3895,30 +3582,30 @@ msgstr "" msgid "Servers" msgstr "Serveri" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Të ndryshueshmet" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Familje gërmash" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 #, fuzzy msgid "Binary log" msgstr "Binar" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Proceset" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3947,51 +3634,51 @@ msgstr "" msgid "Target database" msgstr "Kërko në databazë" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, fuzzy, php-format msgid "Run SQL query/queries on server %s" msgstr "Zbato query SQL tek databaza %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Zbato query SQL tek databaza %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Emrat e kollonave" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Shtoja të preferuarve këtë query SQL" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Lejo që çdo përdorues të ketë hyrje në këtë libërshënues" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Mos e mbishkruaj këtë query nga jashtë dritares" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr "Tregoje përsëri këtë query" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Dërgoje" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Shfaq vetëm" @@ -4171,12 +3858,12 @@ msgstr "" msgid "Save" msgstr "Ruaj" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format msgid "Add %s column(s)" msgstr "Shto një fushë të re" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to add at least one column." @@ -4372,8 +4059,8 @@ msgstr "Rinis" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Përdorues" @@ -4811,119 +4498,119 @@ msgstr "" msgid "View dump (schema) of databases" msgstr "Shfaq dump (skema) e databazave" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Përfshin të gjitha të drejtat me përjashtim të GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Lejon ndryshimin e strukturës së tabelave ekzistuese." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 #, fuzzy msgid "Allows altering and dropping stored routines." msgstr "Lejon krijimin dhe eleminimin e treguesve." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Lejon krijimin e tabelave të reja dhe databazave të reja." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 #, fuzzy msgid "Allows creating stored routines." msgstr "Lejon krijimin e tabelave të reja." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Lejon krijimin e tabelave të reja." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Lejon krijimin e tabelave të përkohëshme." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 #, fuzzy msgid "Allows creating new views." msgstr "Lejon krijimin e tabelave të reja." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Lejon fshirjen e të dhënave." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Lejon eleminimin e databazave dhe tabelave." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Lejon eleminimin e tabelave." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "" "Lejon importimin e të dhënave nga dhe eksportimin e të dhënave në files." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Lejon të shtosh përdorues dhe të drejta pa ringarkuar tabelat e privilegjeve." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Lejon krijimin dhe eleminimin e treguesve." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Lejon futjen dhe mbishkrimin e të dhënave." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Lejon bllokimin e tabelave për thread e momentit." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Kufizon numrin e lidhjeve të reja që një përdorues mund të hapë në një orë." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Kufizon numrin e kërkesave që një përdorues mund ti dërgojë server-it në një " "orë." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4931,63 +4618,63 @@ msgstr "" "Kufizon numrin e komandave që mund të ndryshojnë një tabelë apo databazë që " "një përdorues mund të zbatojë në një orë." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 #, fuzzy msgid "Limits the number of simultaneous connections the user may have." msgstr "" "Kufizon numrin e lidhjeve të reja që një përdorues mund të hapë në një orë." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Nuk ka asnjë efekt tek ky version i MySQL." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Lejon ringarkimin e parametrave të server-it dhe risetimin e cache të " "servërve." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" "I jep të drejtën një përdoruesi të pyesë se ku gjenden slaves / masters." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Nevoitet për replikimin e slaves." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Lejon leximin e të dhënave." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Mundëson hyrjen tek lista komplete e databazave." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Lejon përfundimin e serverit." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -4997,158 +4684,158 @@ msgstr "" "nevojshëm për shumë operacione administrimi si përcaktimi i të " "ndryshueshmeve globale apo fshirja e threads të përdoruesve të tjerë." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "Lejon krijimin dhe eleminimin e treguesve." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Lejon ndryshimin e të dhënave." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Asnjë të drejtë." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Asnjë lloj" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Të drejta relative me tabelat" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr "Shënim: emrat e të drejtave të MySQL janë në Anglisht" -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Të drejtat e përgjithshme" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Të drejta specifike të databazës" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administrimi" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Limitet e rezervave" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" "Shënim: Vendosja e këtyre opcioneve në 0 (zero) do të thotë asnjë limit." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Informacione mbi Identifikimin" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Mos ndrysho fjalëkalim" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Nuk u gjet asnjë përdorues." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Përdoruesi %s ekziston!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Ke shtuar një përdorues të ri." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Ke rifreskuar lejet për %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Ke anulluar të drejtat për %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Fjalëkalimi për përdoruesin %s u ndryshua me sukses." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Në fshirje e sipër të %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Duke ringarkuar të drejtat" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Përdoruesit e zgjedhur u hoqën me sukses." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Të drejtat u përditësuan me sukses." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Ndrysho të drejtat" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Hiq" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Paraqitja e përgjithshme e përdoruesve" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Grant" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Çfarëdo" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Shto një përdorues të ri" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Heq përdoruesit e zgjedhur" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Hiqja të gjitha të drejtat aktive përdoruesve dhe pastaj eleminoi." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Elemino databazat që kanë emër të njëjtë me përdoruesit." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5161,92 +4848,92 @@ msgstr "" "drejtave të përdorura nga serveri nëse janë kryer ndryshime manuale. Në këtë " "rast, duhet të %srifreskoni të drejtat%s para se të vazhdoni." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Përdoruesi i zgjedhur nuk u gjet tek tabela e të drejtave." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Të drejtat relative të kollonave" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Shto të drejta tek databaza në vazhdim" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Shto të drejta tek tabela në vazhdim" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Ndrysho Informacionet e Login / Kopjo përdoruesin" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Krijo një përdorues të ri me të njëjta të drejta dhe ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... mbaj të vjetrin." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... elemino të vjetrin nga tabela e përdoruesve." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... hiq të gjitha të drejtat nga i vjetri e pastaj eleminoje." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" " ... elemino të vjetrin nga tabela e përdoruesve e pastaj rilexo të drejtat." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Asnjë lloj" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "Kontrollo të drejtat për databazën "%s"." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Përdoruesit që kanë hyrje tek "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "globale" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "specifik i databazës" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "wildcard" @@ -7869,25 +7556,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Etiketë" @@ -7939,13 +7626,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Mbrapa" @@ -8026,7 +7706,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Shto tek treguesi i  %s kolonës(ave)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -8143,41 +7823,6 @@ msgstr "Kontrollo integritetin e informacioneve:" msgid "Show tables" msgstr "Shfaq tabelat" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Hapësira e përdorur" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Përdorimi" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Efektiv" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Statistikat e rreshtave" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Instruksione" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinamik" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Gjatësia e rreshtit" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Hapësira e përdorur" @@ -8211,7 +7856,6 @@ msgid "Row length" msgstr "Gjatësia e rreshtit" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "Madhësia e rreshtit" @@ -8284,49 +7928,49 @@ msgstr "Asnjë lloj" msgid "Column %s has been dropped" msgstr "Tabela %s u eleminua" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Një kyç primar u shtua tek %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Një tregues u shtua tek %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Shiko relacionet" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Propozo strukturën e tabelës" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy msgid "Add column" msgstr "Shto një fushë të re" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Në fund të tabelës" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Në fillim të tabelës" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Mbas %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Krijo një tregues tek  %s columns" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8368,6 +8012,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/sr.po b/po/sr.po old mode 100755 new mode 100644 index a3c5b937f..e38dd0168 --- a/po/sr.po +++ b/po/sr.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-30 23:47+0200\n" "Last-Translator: Michal \n" "Language-Team: serbian_cyrillic \n" @@ -20,11 +16,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Прикажи све" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -43,53 +39,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Претраживање" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Крени" @@ -115,7 +95,7 @@ msgstr "Користи ову вредност" msgid "Database %1$s has been created." msgstr "База %s је одбачена." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Коментар базе:" @@ -142,17 +122,10 @@ msgstr "Имена колона" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Тип" @@ -165,7 +138,7 @@ msgstr "Тип" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -189,24 +162,18 @@ msgstr "Везе ка" msgid "Comments" msgstr "Коментари" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Не" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -215,15 +182,9 @@ msgstr "Не" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -242,142 +203,134 @@ msgstr "Прикажи садржај (схему) базе" msgid "No tables found in database." msgstr "Табеле нису пронађене у бази." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Изабери све" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "ништа" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Име базе није задато!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "База %s је преименована у %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "База %s је прекопирана у %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Преименуј базу у" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Наредба" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "и онда" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Копирај базу у" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Само структура" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Структура и подаци" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Само подаци" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREATE DATABASE пре копирања" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Додај %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Додај AUTO_INCREMENT вредност" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Додај ограничења" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Пребаци се на копирану базу" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Статус" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Омогућено" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "Онемогућено" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "Поправи табелу" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Онемогућено" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "Омогућено" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Сортирање" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -386,14 +339,14 @@ msgstr "" "Додатне могућности за рад са повезаним табелама су искључене. Да бисте " "сазнали зашто, кликните %sовде%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Уређивање PDF страна" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -402,11 +355,7 @@ msgstr "Табела" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Редова" @@ -414,42 +363,30 @@ msgstr "Редова" msgid "Size" msgstr "Величина" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "се користи" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Направљено" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Последња измена" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Последња провера" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -511,11 +448,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "или" @@ -549,85 +482,85 @@ msgstr "Користи табеле" msgid "SQL query on database %s:" msgstr "SQL упит на бази %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Изврши SQL упит" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Приступ одбијен" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "бар једну од речи" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "све речи" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "тачан израз" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "као регуларни израз" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Резултати претраге за \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s погодака унутар табеле %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Преглед" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Обриши" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Укупно: %s погодака" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Претраживање базе" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Речи или вредности које се траже (џокер: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Тражи:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Речи се одвајају размаком (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Унутар табела:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -635,36 +568,36 @@ msgstr "Унутар табела:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Нови запис" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Структура" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Одбаци" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Испразни" @@ -674,117 +607,111 @@ msgstr "Испразни" msgid "Table %s has been emptied" msgstr "Табела %s је испражњена" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Поглед %s је одбачен" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Табела %s је одбачена" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Поглед" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Репликација" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Укупно" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s је подразумевани погон складиштења на овом MySQL серверу." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Означено:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Означи све" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "ниједно" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Провери табеле које имају прекорачења" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "За штампу" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Провери табелу" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Оптимизуј табелу" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Поправи табелу" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Анализирај табелу" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Извоз" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Речник података" @@ -796,10 +723,10 @@ msgstr "Провери табелу" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -821,8 +748,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Акција" @@ -859,8 +786,8 @@ msgstr "Само структура" msgid "Untracked tables" msgstr "Провери табелу" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Провери табелу" @@ -944,7 +871,7 @@ msgstr "Обележивач је управо обрисан." msgid "Showing bookmark" msgstr "Приказивање маркера" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Направљен маркер %s" @@ -1028,293 +955,186 @@ msgstr "Име домаћина је празно!" msgid "The user name is empty!" msgstr "Име корисника није унето!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Лозинка је празна!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Лозинке нису идентичне!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Додај новог корисника" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Направи релацију" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Поново учитај привилегије" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Уклони изабране кориснике" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Откажи" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Локални" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Процеси" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "У реду" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Преименуј базу у" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "База података" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Копирај базу у" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Карактер сет" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Табела мора имати барем једно поље." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Направи табелу" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Претраживање" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Измене су сачуване" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Релација обрисана" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Додата интерна релација" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Грешка: релација није додата." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Грешка: релација већ постоји." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Грешка при снимању координата за Дизајнер." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Опште особине релација" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Онемогућено" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Изаберите референцирани кључ" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Изабери страни кључ" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Молимо изаберите примарни или јединствени кључ" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Изабери поља за приказ" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy msgid "Done" msgstr "Подаци" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Претходна" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Следећи" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Укупно" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Бинарни" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "мар" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "апр" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "мај" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "јун" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "јул" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "авг" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "окт" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "јан" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "феб" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "мар" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "апр" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1322,176 +1142,176 @@ msgid "May" msgstr "мај" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "јун" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "јул" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "авг" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "сеп" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "окт" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "нов" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "дец" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Нед" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Пон" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Уто" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Пет" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Нед" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Пон" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Уто" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Сре" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Чет" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Пет" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Суб" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Нед" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Пон" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Уто" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Сре" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Чет" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Пет" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Суб" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "се користи" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1552,7 +1372,7 @@ msgstr "Кључеви" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Јединствени" @@ -1571,7 +1391,7 @@ msgid "Comment" msgstr "Коментари" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1594,8 +1414,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Базе" @@ -1765,11 +1585,7 @@ msgstr "Лозинка:" msgid "Server Choice" msgstr "Избор сервера" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Колачићи (Cookies) морају у овом случају бити активни." @@ -1849,11 +1665,7 @@ msgstr "" "Не могу да користим iconv или libiconv или recode_string функције иако " "екстензија пријављује да је учитана. Проверите вашу PHP конфигурацију." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Ако добијете празну страну, све је " "у реду." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Не могу да учитам подразумевану конфигурацију из: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1891,48 +1695,28 @@ msgstr "" "$cfg['PmaAbsoluteUri'] директива МОРА бити подешена у " "конфигурационој датотеци!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Неисправан индекс сервера: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "Неисправан назив сервера %1$s. Молимо проверите своју конфигурацију." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Сервер" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Неисправан метод аутентикације је задат у конфигурацији:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Неисправан метод аутентикације је задат у конфигурацији:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Требало би да унапредите ваш %s сервер на верзију %s или новију." @@ -1958,7 +1742,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Документација" @@ -1972,138 +1756,138 @@ msgstr "SQL упит" msgid "MySQL said: " msgstr "MySQL рече: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Објасни SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Прескочи објашњавање SQL-a" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "без PHP кода" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Направи PHP код" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Освежи" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Прескочи проверу SQL-a" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Провери SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Складиштења" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Профилисање" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Време" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "бајтова" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "КБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "МБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "ГБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "ТБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "ПБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "ЕБ" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d. %B %Y. у %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s дана, %s сати, %s минута и %s секунди" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Почетак" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Претходна" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Крај" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Пређи на базу "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "Ова функционалност %s је погођена познатом грешком, видите %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2124,7 +1908,7 @@ msgid "Events" msgstr "Догађаји" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Име" @@ -2152,15 +1936,15 @@ msgstr "Упит по примеру" msgid "Designer" msgstr "Дизајнер" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Увоз" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Привилегије" @@ -2179,11 +1963,7 @@ msgid "" msgstr "Може бити приближно. Видите FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Прекорачење" @@ -2202,7 +1982,7 @@ msgstr "Сервер не одговара" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(или прикључак локалног MySQL сервера није исправно подешен)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2212,36 +1992,22 @@ msgid "Change password" msgstr "Промени лозинку" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Нема лозинке" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Лозинка" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Поновите унос" @@ -2256,20 +2022,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 компатибилно" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Направи лозинку" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Направи" @@ -2282,17 +2040,23 @@ msgstr "Направи нову базу података" msgid "Create" msgstr "Направи" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Нема привилегија" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Табела мора имати барем једно поље." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Направи нову табелу у бази %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2358,11 +2122,7 @@ msgid "remember template" msgstr "запамти шаблон" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Карактер сет датотеке:" @@ -2373,7 +2133,7 @@ msgstr "Компресија" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "нема" @@ -2415,11 +2175,7 @@ msgstr "" msgid "File to import" msgstr "Датотека за увоз" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Локација текстуалне датотеке" @@ -2427,20 +2183,12 @@ msgstr "Локација текстуалне датотеке" msgid "File uploads are not allowed on this server." msgstr "Слање датотека на овај сервер није дозвољено." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Директоријум који сте изабрали за слање није доступан" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "директоријум за слање веб сервера " @@ -2576,11 +2324,7 @@ msgstr "Сортирај по кључу" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Опције" @@ -2651,14 +2395,14 @@ msgstr "Приказ записа" msgid "total" msgstr "укупно" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Упит је трајао %01.4f секунди" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Промени" @@ -2729,11 +2473,7 @@ msgstr "Коришћење скупа прихватника" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Укупно" @@ -2994,11 +2734,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Формат" @@ -3070,13 +2806,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Подаци" @@ -3125,15 +2856,9 @@ msgstr "MIME-типови" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Домаћин" @@ -3332,7 +3057,7 @@ msgstr "Тип извоза" msgid "Open new phpMyAdmin window" msgstr "Отвори нови phpMyAdmin прозор" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Нема табела" @@ -3345,7 +3070,7 @@ msgstr "SQL резултат" msgid "Generated by" msgstr "Генерисао" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL је вратио празан резултат (нула редова)." @@ -3495,20 +3220,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Примарни" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Кључ" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Текст кључ" @@ -3733,6 +3458,10 @@ msgstr "Не постоје опције за овај формат" msgid "not OK" msgstr "није у реду" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "У реду" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Омогућено" @@ -3755,7 +3484,7 @@ msgid "" msgstr "" "Молимо погледајте у документацији како се ажурира табела Column_comments" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Запамћен SQL-упит" @@ -3806,13 +3535,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Име корисника" @@ -3832,22 +3556,14 @@ msgstr "Прикажи статус подређених сервера" msgid "Slave status" msgstr "Прикажи статус подређених сервера" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Променљива" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Вредност" @@ -3865,40 +3581,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Било који корисник" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Користи текст поље" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Било који домаћин" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Локални" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Овај сервер" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Користи табелу домаћина" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3922,7 +3609,6 @@ msgid "Use Host Table" msgstr "Користи табелу домаћина" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3956,29 +3642,29 @@ msgstr "Непознат језик: %1$s." msgid "Servers" msgstr "Сервери" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Променљиве" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Кодне стране" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Складиштења" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Бинарни дневник" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Процеси" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -4007,51 +3693,51 @@ msgstr "" msgid "Target database" msgstr "Претраживање базе" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Изврши SQL упит(е) на серверу %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Изврши SQL упит(е) на бази %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Имена колона" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Запамти SQL-упит" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Дозволи сваком кориснику да приступа овом упамћеном упиту" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Замени постојеће запамћене упите истог имена" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Не преписуј овај упит изван прозора" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Граничник" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr "Прикажи поново овај упит" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Пошаљи" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Види само" @@ -4227,13 +3913,13 @@ msgstr "" msgid "Save" msgstr "Сачувај" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "Додај %s поља" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4444,8 +4130,8 @@ msgstr "Поништи" msgid "Protocol version" msgstr "Верзија протокола" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Корисник" @@ -4894,113 +4580,113 @@ msgstr "Погони складиштења" msgid "View dump (schema) of databases" msgstr "Прикажи садржај (схему) базе" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Укључује све привилегије осим GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Дозвољава измену структура постојећих табела." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Дозвољава измену и одбацивање сачуваних рутина." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Дозвољава креирање нових база и табела." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Дозвољава прављење сачуваних рутина." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Дозвољава креирање нових табела." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Дозвољава креирање привремених табела.." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Дозвољава прављење, одбацивање и преименовање корисничких налога." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Дозволи креирање нових погледа." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Дозвољава брисање података." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Дозвољава одбацивање база и табела." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Дозвољава одбацивање табела." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Дозвољава извршавање сачуваних рутина." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Дозвољава увоз података и њихов извоз у датотеке." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Дозвољава додавање корисника и привилегија без поновног учитавања табела " "привилегија." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Дозвољава креирање и брисање кључева." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Дозвољава уметање и замену података." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Дозвољава закључавање табела текућим процесима." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Ограничава број нових конекција које корисник може та отвори на сат." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Ограничава број упита које корисник може да упути серверу за сат." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5008,59 +4694,59 @@ msgstr "" "Ограничава број команди које мењају табеле или базе које корисник може да " "изврши на сат." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Ограничава број истовремених конекција које корисник може да има." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Нема ефекта у овој верзији MySQL-a." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Дозвољава поновно учитавање подешавања сервера и пражњење кеша сервера." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Даје право кориснику да пита где су главни/помоћни сервери." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Потребно због помоћних сервера за репликацију." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Дозвољава читање података." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Даје приступ комплетној листи база." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Дозвољава извршавање SHOW CREATE VIEW упита." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Дозвољава гашење сервера." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5070,157 +4756,157 @@ msgstr "" "Неопходно за већину административних опција као што су подешавање глобалних " "променљивих или прекидање процеса осталих корисника." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "Дозвољава креирање и брисање кључева." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Дозвољава измену података." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Нема привилегија." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "нема" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Привилегије везане за табеле" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Напомена: MySQL имена привилегија морају да буду на енглеском " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Глобалне привилегије" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Привилегије везане за базу" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Администрација" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Ограничења ресурса" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Напомена: Постављање ових опција на 0 (нулу) уклања ограничења." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Подаци о пријави" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Немој да мењаш лозинку" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Корисник није нађен." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Корисник %s већ постоји!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Додали сте новог корисника." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Ажурирали сте привилегије за %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Забранили сте привилегије за %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Лозинка за %s је успешно промењена." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Бришем %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Ниједан корисник није одабран за брисање!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Поново учитавам привилегије" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Изабрани корисници су успешно обрисани." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Привилегије су успешно поново учитане." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Промени привилегије" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Забрани" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Преглед корисника" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Омогући" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Било који" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Додај новог корисника" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Уклони изабране кориснике" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Обустави све активне привилегије корисника и затим их обриши." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Одбаци базе које се зову исто као корисници." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5233,92 +4919,92 @@ msgstr "" "сервер користи ако су вршене ручне измене. У том случају %sпоново учитајте " "привилегије%s пре него што наставите." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Изабрани корисник није пронађен у табели привилегија." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Привилегије везане за колоне" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Додај привилегије на следећој бази" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "Пре џокера _ и % треба ставити знак \\ ако их користите самостално" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Додај привилегије на следећој табели" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Промени информације о пријави / Копирај корисника" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Направи новог корисника са истим привилегијама и ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... сачувај старе." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... обриши старе из табела корисника." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... обустави све привилегије старог корисника и затим га обриши." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" " ... обриши старог из табеле корисника и затим поново учитај привилегије." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "База за корисника" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "нема" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Направи базу са истим именом и додај све привилегије" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Дај све привилегије на имену са џокерима (корисничко_име\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "Провери привилегије за базу "%s"." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Корисници који имају приступ "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "глобално" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "Специфично за базу" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "џокер" @@ -8070,25 +7756,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Приказ као PHP код" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Приказ као SQL упит" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Проблем при индексирању табеле `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Назив" @@ -8141,13 +7827,6 @@ msgstr "" msgid "Show insert query" msgstr "Приказ као SQL упит" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "и онда" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Назад на претходну страну" @@ -8228,7 +7907,7 @@ msgstr "(\"PRIMARY\" мора бити име само прима msgid "Add to index  %s column(s)" msgstr "Додај у кључ  %s колона(е)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Број колона мора бити већи од нуле." @@ -8345,41 +8024,6 @@ msgstr "Провери референцијални интегритет:" msgid "Show tables" msgstr "Прикажи табеле" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Заузеће" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Заузеће" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Ефективне" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Статистике реда" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Име" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "динамички" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Дужина реда" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Заузеће" @@ -8413,7 +8057,6 @@ msgid "Row length" msgstr "Дужина реда" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "Величина реда" @@ -8485,50 +8128,50 @@ msgstr "нема" msgid "Column %s has been dropped" msgstr "Табела %s је одбачена" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Примарни кључ је управо додат %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Кључ је управо додат %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Релациони поглед" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Предложи структуру табеле" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "Додај %s поља" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "На крају табеле" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "На почетку табеле" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "После %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Направи кључ на %s колона" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8570,6 +8213,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8979,6 +8626,9 @@ msgstr "Промени име табеле у " #~ msgid "Process list" #~ msgstr "Листа процеса" +#~ msgid "Reload privileges" +#~ msgstr "Поново учитај привилегије" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/sr@latin.po b/po/sr@latin.po old mode 100755 new mode 100644 index 001bc16e6..1caa724df --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-30 23:47+0200\n" "Last-Translator: Michal \n" "Language-Team: serbian_latin \n" @@ -20,11 +16,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Prikaži sve" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -43,53 +39,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Pretraživanje" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Kreni" @@ -115,7 +95,7 @@ msgstr "Koristi ovu vrednost" msgid "Database %1$s has been created." msgstr "Baza %s je odbačena." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Komentar baze:" @@ -142,17 +122,10 @@ msgstr "Imena kolona" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Tip" @@ -165,7 +138,7 @@ msgstr "Tip" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -189,24 +162,18 @@ msgstr "Veze ka" msgid "Comments" msgstr "Komentari" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Ne" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -215,15 +182,9 @@ msgstr "Ne" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -242,142 +203,134 @@ msgstr "Prikaži sadržaj (shemu) baze" msgid "No tables found in database." msgstr "Tabele nisu pronađene u bazi." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Izaberi sve" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "ništa" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Ime baze nije zadato!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Baza %s je preimenovana u %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Baza %s je prekopirana u %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Preimenuj bazu u" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Naredba" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "i onda" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Kopiraj bazu u" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Samo struktura" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Struktura i podaci" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Samo podaci" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREATE DATABASE pre kopiranja" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Dodaj %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Dodaj AUTO_INCREMENT vrednost" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Dodaj ograničenja" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Prebaci se na kopiranu bazu" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Status" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Omogućeno" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "Onemogućeno" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "Popravi tabelu" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Onemogućeno" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "Omogućeno" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Sortiranje" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -386,14 +339,14 @@ msgstr "" "Dodatne mogućnosti za rad sa povezanim tabelama su isključene. Da biste " "saznali zašto, kliknite %sovde%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Uređivanje PDF strana" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -402,11 +355,7 @@ msgstr "Tabela" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Redova" @@ -414,42 +363,30 @@ msgstr "Redova" msgid "Size" msgstr "Veličina" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "se koristi" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Napravljeno" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Poslednja izmena" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Poslednja provera" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -511,11 +448,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "ili" @@ -549,85 +482,85 @@ msgstr "Koristi tabele" msgid "SQL query on database %s:" msgstr "SQL upit na bazi %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Izvrši SQL upit" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Pristup odbijen" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "bar jednu od reči" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "sve reči" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "tačan izraz" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "kao regularni izraz" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Rezultati pretrage za \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s pogodaka unutar tabele %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Pregled" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Obriši" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Ukupno: %s pogodaka" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Pretraživanje baze" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Reči ili vrednosti koje se traže (džoker: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Traži:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Reči se odvajaju razmakom (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Unutar tabela:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -635,36 +568,36 @@ msgstr "Unutar tabela:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Novi zapis" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Struktura" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Odbaci" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Isprazni" @@ -674,117 +607,111 @@ msgstr "Isprazni" msgid "Table %s has been emptied" msgstr "Tabela %s je ispražnjena" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Pogled %s je odbačen" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Tabela %s je odbačena" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Pogled" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replikacija" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Ukupno" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s je podrazumevani pogon skladištenja na ovom MySQL serveru." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Označeno:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Označi sve" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "nijedno" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Proveri tabele koje imaju prekoračenja" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Za štampu" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Proveri tabelu" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimizuj tabelu" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Popravi tabelu" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analiziraj tabelu" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Izvoz" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Rečnik podataka" @@ -796,10 +723,10 @@ msgstr "Proveri tabelu" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -821,8 +748,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Akcija" @@ -859,8 +786,8 @@ msgstr "Samo struktura" msgid "Untracked tables" msgstr "Proveri tabelu" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Proveri tabelu" @@ -944,7 +871,7 @@ msgstr "Obeleživač je upravo obrisan." msgid "Showing bookmark" msgstr "Prikazivanje markera" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Napravljen marker %s" @@ -1028,293 +955,186 @@ msgstr "Ime domaćina je prazno!" msgid "The user name is empty!" msgstr "Ime korisnika nije uneto!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Lozinka je prazna!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Lozinke nisu identične!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Dodaj novog korisnika" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Napravi relaciju" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Ponovo učitaj privilegije" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Ukloni izabrane korisnike" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Otkaži" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Lokalni" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Procesi" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "U redu" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Preimenuj bazu u" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Baza podataka" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Kopiraj bazu u" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Karakter set" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Tabela mora imati barem jedno polje." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Napravi tabelu" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Pretraživanje" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Izmene su sačuvane" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Relacija obrisana" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Dodata interna relacija" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Greška: relacija nije dodata." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Greška: relacija već postoji." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Greška pri snimanju koordinata za Dizajner." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Opšte osobine relacija" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Onemogućeno" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Izaberite referencirani ključ" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Izaberi strani ključ" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Molimo izaberite primarni ili jedinstveni ključ" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Izaberi polja za prikaz" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy msgid "Done" msgstr "Podaci" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Prethodna" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Sledeći" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Ukupno" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Binarni" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "mar" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "apr" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "maj" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "jun" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "jul" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "avg" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "okt" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "jan" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "feb" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "apr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1322,176 +1142,176 @@ msgid "May" msgstr "maj" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "jun" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "jul" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "avg" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "sep" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "okt" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "nov" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "dec" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Ned" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Pon" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Uto" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Pet" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Ned" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Pon" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Uto" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Sre" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Čet" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Pet" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sub" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Ned" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Pon" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Uto" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Sre" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Čet" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Pet" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Sub" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "se koristi" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1552,7 +1372,7 @@ msgstr "Ključevi" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Jedinstveni" @@ -1571,7 +1391,7 @@ msgid "Comment" msgstr "Komentari" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1594,8 +1414,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Baze" @@ -1765,11 +1585,7 @@ msgstr "Lozinka:" msgid "Server Choice" msgstr "Izbor servera" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Kolačići (Cookies) moraju u ovom slučaju biti aktivni." @@ -1849,11 +1665,7 @@ msgstr "" "Ne mogu da koristim iconv ili libiconv ili recode_string funkcije iako " "ekstenzija prijavljuje da je učitana. Proverite vašu PHP konfiguraciju." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Ako dobijete praznu stranu, sve je " "u redu." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Ne mogu da učitam podrazumevanu konfiguraciju iz: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1891,48 +1695,28 @@ msgstr "" "$cfg['PmaAbsoluteUri'] direktiva MORA biti podešena u " "konfiguracionoj datoteci!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Neispravan indeks servera: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "Neispravan naziv servera %1$s. Molimo proverite svoju konfiguraciju." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Server" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Neispravan metod autentikacije je zadat u konfiguraciji:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Neispravan metod autentikacije je zadat u konfiguraciji:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Trebalo bi da unapredite vaš %s server na verziju %s ili noviju." @@ -1958,7 +1742,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentacija" @@ -1972,138 +1756,138 @@ msgstr "SQL upit" msgid "MySQL said: " msgstr "MySQL reče: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Objasni SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Preskoči objašnjavanje SQL-a" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "bez PHP koda" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Napravi PHP kod" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Osveži" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Preskoči proveru SQL-a" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Proveri SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Skladištenja" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Profilisanje" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Vreme" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "bajtova" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d. %B %Y. u %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s dana, %s sati, %s minuta i %s sekundi" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Početak" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Prethodna" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Kraj" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Pređi na bazu "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "Ova funkcionalnost %s je pogođena poznatom greškom, vidite %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2124,7 +1908,7 @@ msgid "Events" msgstr "Događaji" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Ime" @@ -2152,15 +1936,15 @@ msgstr "Upit po primeru" msgid "Designer" msgstr "Dizajner" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Uvoz" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privilegije" @@ -2179,11 +1963,7 @@ msgid "" msgstr "Može biti približno. Vidite FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Prekoračenje" @@ -2202,7 +1982,7 @@ msgstr "Server ne odgovara" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(ili priključak lokalnog MySQL servera nije ispravno podešen)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2212,36 +1992,22 @@ msgid "Change password" msgstr "Promeni lozinku" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Nema lozinke" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Lozinka" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Ponovite unos" @@ -2256,20 +2022,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 kompatibilno" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Napravi lozinku" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Napravi" @@ -2282,17 +2040,23 @@ msgstr "Napravi novu bazu podataka" msgid "Create" msgstr "Napravi" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Nema privilegija" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Tabela mora imati barem jedno polje." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Napravi novu tabelu u bazi %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2358,11 +2122,7 @@ msgid "remember template" msgstr "zapamti šablon" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Karakter set datoteke:" @@ -2373,7 +2133,7 @@ msgstr "Kompresija" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "nema" @@ -2415,11 +2175,7 @@ msgstr "" msgid "File to import" msgstr "Datoteka za uvoz" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Lokacija tekstualne datoteke" @@ -2427,20 +2183,12 @@ msgstr "Lokacija tekstualne datoteke" msgid "File uploads are not allowed on this server." msgstr "Slanje datoteka na ovaj server nije dozvoljeno." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Direktorijum koji ste izabrali za slanje nije dostupan" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "direktorijum za slanje veb servera " @@ -2576,11 +2324,7 @@ msgstr "Sortiraj po ključu" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Opcije" @@ -2651,14 +2395,14 @@ msgstr "Prikaz zapisa" msgid "total" msgstr "ukupno" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Upit je trajao %01.4f sekundi" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Promeni" @@ -2729,11 +2473,7 @@ msgstr "Korišćenje skupa prihvatnika" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Ukupno" @@ -2994,11 +2734,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Format" @@ -3070,13 +2806,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Podaci" @@ -3125,15 +2856,9 @@ msgstr "MIME-tipovi" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Domaćin" @@ -3332,7 +3057,7 @@ msgstr "Tip izvoza" msgid "Open new phpMyAdmin window" msgstr "Otvori novi phpMyAdmin prozor" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Nema tabela" @@ -3345,7 +3070,7 @@ msgstr "SQL rezultat" msgid "Generated by" msgstr "Generisao" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL je vratio prazan rezultat (nula redova)." @@ -3495,20 +3220,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primarni" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Ključ" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Tekst ključ" @@ -3733,6 +3458,10 @@ msgstr "Ne postoje opcije za ovaj format" msgid "not OK" msgstr "nije u redu" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "U redu" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Omogućeno" @@ -3755,7 +3484,7 @@ msgid "" msgstr "" "Molimo pogledajte u dokumentaciji kako se ažurira tabela Column_comments" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Zapamćen SQL-upit" @@ -3806,13 +3535,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Ime korisnika" @@ -3832,22 +3556,14 @@ msgstr "Prikaži status podređenih servera" msgid "Slave status" msgstr "Prikaži status podređenih servera" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Promenljiva" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Vrednost" @@ -3865,40 +3581,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Bilo koji korisnik" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Koristi tekst polje" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Bilo koji domaćin" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Lokalni" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Ovaj server" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Koristi tabelu domaćina" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3922,7 +3609,6 @@ msgid "Use Host Table" msgstr "Koristi tabelu domaćina" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3956,29 +3642,29 @@ msgstr "Nepoznat jezik: %1$s." msgid "Servers" msgstr "Serveri" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Promenljive" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Kodne strane" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Skladištenja" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Binarni dnevnik" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Procesi" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -4007,51 +3693,51 @@ msgstr "" msgid "Target database" msgstr "Pretraživanje baze" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Izvrši SQL upit(e) na serveru %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Izvrši SQL upit(e) na bazi %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Imena kolona" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Zapamti SQL-upit" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Dozvoli svakom korisniku da pristupa ovom upamćenom upitu" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Zameni postojeće zapamćene upite istog imena" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Ne prepisuj ovaj upit izvan prozora" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Graničnik" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr "Prikaži ponovo ovaj upit" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Pošalji" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Vidi samo" @@ -4227,13 +3913,13 @@ msgstr "" msgid "Save" msgstr "Sačuvaj" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "Dodaj %s polja" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4445,8 +4131,8 @@ msgstr "Poništi" msgid "Protocol version" msgstr "Verzija protokola" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Korisnik" @@ -4896,113 +4582,113 @@ msgstr "Pogoni skladištenja" msgid "View dump (schema) of databases" msgstr "Prikaži sadržaj (shemu) baze" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Uključuje sve privilegije osim GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Dozvoljava izmenu struktura postojećih tabela." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Dozvoljava izmenu i odbacivanje sačuvanih rutina." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Dozvoljava kreiranje novih baza i tabela." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Dozvoljava pravljenje sačuvanih rutina." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Dozvoljava kreiranje novih tabela." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Dozvoljava kreiranje privremenih tabela.." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Dozvoljava pravljenje, odbacivanje i preimenovanje korisničkih naloga." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Dozvoli kreiranje novih pogleda." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Dozvoljava brisanje podataka." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Dozvoljava odbacivanje baza i tabela." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Dozvoljava odbacivanje tabela." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Dozvoljava izvršavanje sačuvanih rutina." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Dozvoljava uvoz podataka i njihov izvoz u datoteke." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Dozvoljava dodavanje korisnika i privilegija bez ponovnog učitavanja tabela " "privilegija." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Dozvoljava kreiranje i brisanje ključeva." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Dozvoljava umetanje i zamenu podataka." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Dozvoljava zaključavanje tabela tekućim procesima." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Ograničava broj novih konekcija koje korisnik može ta otvori na sat." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Ograničava broj upita koje korisnik može da uputi serveru za sat." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5010,59 +4696,59 @@ msgstr "" "Ograničava broj komandi koje menjaju tabele ili baze koje korisnik može da " "izvrši na sat." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Ograničava broj istovremenih konekcija koje korisnik može da ima." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Nema efekta u ovoj verziji MySQL-a." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Dozvoljava ponovno učitavanje podešavanja servera i pražnjenje keša servera." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Daje pravo korisniku da pita gde su glavni/pomoćni serveri." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Potrebno zbog pomoćnih servera za replikaciju." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Dozvoljava čitanje podataka." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Daje pristup kompletnoj listi baza." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Dozvoljava izvršavanje SHOW CREATE VIEW upita." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Dozvoljava gašenje servera." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5072,157 +4758,157 @@ msgstr "" "Neophodno za većinu administrativnih opcija kao što su podešavanje globalnih " "promenljivih ili prekidanje procesa ostalih korisnika." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "Dozvoljava kreiranje i brisanje ključeva." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Dozvoljava izmenu podataka." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Nema privilegija." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "nema" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Privilegije vezane za tabele" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Napomena: MySQL imena privilegija moraju da budu na engleskom " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Globalne privilegije" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Privilegije vezane za bazu" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administracija" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Ograničenja resursa" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Napomena: Postavljanje ovih opcija na 0 (nulu) uklanja ograničenja." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Podaci o prijavi" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Nemoj da menjaš lozinku" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Korisnik nije nađen." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Korisnik %s već postoji!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Dodali ste novog korisnika." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Ažurirali ste privilegije za %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Zabranili ste privilegije za %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Lozinka za %s je uspešno promenjena." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Brišem %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Nijedan korisnik nije odabran za brisanje!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Ponovo učitavam privilegije" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Izabrani korisnici su uspešno obrisani." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Privilegije su uspešno ponovo učitane." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Promeni privilegije" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Zabrani" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Pregled korisnika" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Omogući" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Bilo koji" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Dodaj novog korisnika" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Ukloni izabrane korisnike" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Obustavi sve aktivne privilegije korisnika i zatim ih obriši." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Odbaci baze koje se zovu isto kao korisnici." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5235,92 +4921,92 @@ msgstr "" "server koristi ako su vršene ručne izmene. U tom slučaju %sponovo učitajte " "privilegije%s pre nego što nastavite." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Izabrani korisnik nije pronađen u tabeli privilegija." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Privilegije vezane za kolone" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Dodaj privilegije na sledećoj bazi" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "Pre džokera _ i % treba staviti znak \\ ako ih koristite samostalno" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Dodaj privilegije na sledećoj tabeli" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Promeni informacije o prijavi / Kopiraj korisnika" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Napravi novog korisnika sa istim privilegijama i ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... sačuvaj stare." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... obriši stare iz tabela korisnika." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... obustavi sve privilegije starog korisnika i zatim ga obriši." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" " ... obriši starog iz tabele korisnika i zatim ponovo učitaj privilegije." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Baza za korisnika" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "nema" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Napravi bazu sa istim imenom i dodaj sve privilegije" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Daj sve privilegije na imenu sa džokerima (korisničko_ime\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "Proveri privilegije za bazu "%s"." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Korisnici koji imaju pristup "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "globalno" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "Specifično za bazu" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "džoker" @@ -8075,25 +7761,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Prikaz kao PHP kod" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Prikaz kao SQL upit" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Problem pri indeksiranju tabele `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Naziv" @@ -8146,13 +7832,6 @@ msgstr "" msgid "Show insert query" msgstr "Prikaz kao SQL upit" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "i onda" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Nazad na prethodnu stranu" @@ -8233,7 +7912,7 @@ msgstr "(\"PRIMARY\" mora biti ime samo primarnog ključa!)" msgid "Add to index  %s column(s)" msgstr "Dodaj u ključ  %s kolona(e)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Broj kolona mora biti veći od nule." @@ -8350,41 +8029,6 @@ msgstr "Proveri referencijalni integritet:" msgid "Show tables" msgstr "Prikaži tabele" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Zauzeće" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Zauzeće" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Efektivne" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Statistike reda" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Ime" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinamički" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Dužina reda" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Zauzeće" @@ -8418,7 +8062,6 @@ msgid "Row length" msgstr "Dužina reda" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "Veličina reda" @@ -8490,50 +8133,50 @@ msgstr "nema" msgid "Column %s has been dropped" msgstr "Tabela %s je odbačena" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Primarni ključ je upravo dodat %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Ključ je upravo dodat %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Relacioni pogled" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Predloži strukturu tabele" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "Dodaj %s polja" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Na kraju tabele" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Na početku tabele" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Posle %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Napravi ključ na %s kolona" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8575,6 +8218,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8984,6 +8631,9 @@ msgstr "Promeni ime tabele u " #~ msgid "Process list" #~ msgstr "Lista procesa" +#~ msgid "Reload privileges" +#~ msgstr "Ponovo učitaj privilegije" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/sv.po b/po/sv.po old mode 100755 new mode 100644 index 32dc16205..43093bb94 --- a/po/sv.po +++ b/po/sv.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:19+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: swedish \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Visa alla" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Sök" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Kör" @@ -113,7 +93,7 @@ msgstr "Använd detta värde" msgid "Database %1$s has been created." msgstr "Databas %1$s har skapats." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Databaskommentar: " @@ -140,17 +120,10 @@ msgstr "Kolumn-namn" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Typ" @@ -163,7 +136,7 @@ msgstr "Typ" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -187,24 +160,18 @@ msgstr "Länkar till" msgid "Comments" msgstr "Kommentarer" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Nej" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -213,15 +180,9 @@ msgstr "Nej" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -240,141 +201,133 @@ msgstr "Visa SQL-satser för databasen" msgid "No tables found in database." msgstr "Inga tabeller funna i databasen." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Markera alla" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Avmarkera alla" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Databasens namn är tomt!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Databas %s har döpts om till %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Databas %s har kopierats till %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Döp om databasen till" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Kommando" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "och sedan" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Kopiera databas till" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Enbart struktur" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Struktur och data" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Enbart data" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "CREATE DATABASE före kopiering" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "Lägg till %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "Lägg till AUTO_INCREMENT-värde" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Lägg till restriktioner" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Byt till kopierad databas" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "BLOB-förvaringsplats" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Status" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Aktiverat" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Inaktivera" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Skadad" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair" msgctxt "BLOB repository" msgid "Repair" msgstr "Reparera" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Inaktiverat" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Aktivera" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Kollationering" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -383,14 +336,14 @@ msgstr "" "Den extra funktionaliteten för att hantera länkade tabeller har " "inaktiverats. %sVisa orsaken%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Redigera PDF-sidor" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -399,11 +352,7 @@ msgstr "Tabell" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Rader" @@ -411,42 +360,30 @@ msgstr "Rader" msgid "Size" msgstr "Storlek" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "används" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Skapades" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Senaste uppdatering" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Senaste kontroll" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -507,11 +444,7 @@ msgstr "Ta bort" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Eller" @@ -545,85 +478,85 @@ msgstr "Använd tabeller" msgid "SQL query on database %s:" msgstr "SQL-fråga i databas %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Kör fråga" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Åtkomst nekad" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "minst ett av orden" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "alla ord" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "den exakta frasen" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "som reguljärt uttryck" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Resultat av sökning efter \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s träff(ar) i tabell %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Visa" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Radera" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Totalt: %s träff(ar)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Sök i databas" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Ord eller värde(n) att söka efter (jokertecken: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Hitta:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Ord separeras med mellanslag (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "I tabell(er):" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -631,36 +564,36 @@ msgstr "I fält:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Lägg till" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Struktur" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Radera" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Töm" @@ -670,117 +603,111 @@ msgstr "Töm" msgid "Table %s has been emptied" msgstr "Tabellen %s har tömts" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "Vyn %s har tagits bort" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Tabellen %s har tagits bort" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "Denna vy har åtminstone detta antal rader. Se %sdokumentation%s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Vy" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replikering" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Summa" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s är standardlagringsmotorn på denna MySQL-server." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Med markerade:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Markera alla" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Avmarkera alla" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Markera ooptimerade" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Utskriftsvänlig visning" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Kontrollera tabell" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimera tabell" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Reparera tabell" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Analysera tabell" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Exportera" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Datalexikon" @@ -792,10 +719,10 @@ msgstr "Hoppa över låsta tabeller" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -817,8 +744,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Åtgärd" @@ -855,8 +782,8 @@ msgstr "Enbart struktur" msgid "Untracked tables" msgstr "Hoppa över låsta tabeller" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Kontrollera tabell" @@ -940,7 +867,7 @@ msgstr "Bokmärket har tagits bort." msgid "Showing bookmark" msgstr "Visar bokmärke" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Bokmärket %s har skapats" @@ -1024,295 +951,187 @@ msgstr "Värdnamnet är tomt!" msgid "The user name is empty!" msgstr "Användarnamnet är tomt!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Lösenordet är tomt!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Lösenorden är inte lika!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Lägg till ny användare" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Skapa relation" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Ladda om privilegier" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Ta bort markerade användare" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Avbryt" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Ladda" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Processer" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Döp om databasen till" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Databas" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Kopiera databas till" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Teckenuppsättning" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Tabell måste ha åtminstone ett fält." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Skapa tabell" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Sök" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Ändringarna har sparats" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Relation borttagen" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "Främmande nyckel-relation tillagd" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Intern relation tillagd" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Fel: Relation inte tillagd." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Fel: Relation finns redan." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Fel vid sparande av koordinater för Designer." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Allmänna relationsfunktionaliteter" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Inaktiverat" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Välj refererad nyckel" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Välj främmande nyckel" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Välj den primära nyckeln eller en unik nyckel" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Välj fält som ska visas" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "Donate" msgid "Done" msgstr "Donera" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Föregående" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Nästa" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Totalt" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Binär" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "mars" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "april" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "maj" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "juni" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "juli" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "augusti" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "oktober" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "januari" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "februari" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "mars" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "april" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1320,178 +1139,178 @@ msgid "May" msgstr "maj" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "juni" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "juli" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "augusti" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "september" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "oktober" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "november" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "december" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Sön" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Mån" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Tis" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Fre" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Sön" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Mån" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Tis" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Ons" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Tors" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Fre" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Lör" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Sön" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Mån" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Tis" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Ons" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Tors" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Fre" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Lör" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "Wiki" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "används" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1551,7 +1370,7 @@ msgstr "Index" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unik" @@ -1569,7 +1388,7 @@ msgid "Comment" msgstr "Kommentar" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1594,8 +1413,8 @@ msgstr "" "Indexen %1$s och %2$s verkar vara identiska och ett av dem kan möjligen tas " "bort." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Databaser" @@ -1768,11 +1587,7 @@ msgstr "Lösenord:" msgid "Server Choice" msgstr "Serverval" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Kakor (cookies) måste tillåtas för att gå vidare." @@ -1855,11 +1670,7 @@ msgstr "" "fastän de nödvändiga tilläggen verkar vara laddade. Kontrollera din PHP-" "konfiguration." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Om du erhåller en tom sida är allt bra." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Kunde inte ladda standardkonfiguration från: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1896,48 +1699,28 @@ msgstr "" "Variabeln $cfg['PmaAbsoluteUri'] MÅSTE anges i din " "konfigurationsfil!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Ogiltigt serverindex: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "Ogiltigt värdnamn för server %1$s. Var god granska din konfiguration." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Server" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Ogiltig metod för autentisering angiven i konfiguration:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Ogiltig metod för autentisering angiven i konfiguration:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "Du bör uppgradera till %s %s eller senare." @@ -1965,7 +1748,7 @@ msgstr "Skickade" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentation" @@ -1979,138 +1762,138 @@ msgstr "SQL-fråga" msgid "MySQL said: " msgstr "MySQL sa: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Förklara SQL-kod" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Utan SQL-förklaring" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "Utan PHP-kod" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Skapa PHP-kod" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Uppdatera" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Utan SQL-validering" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Validera SQL-kod" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Motorer" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Under produktion" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Tid" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "bytes" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EiB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr " " #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d %B %Y kl %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s dagar, %s timmar, %s minuter och %s sekunder" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Början" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Föregående" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Slutet" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Hoppa till databas "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "Funktionaliteten för %s påverkas av en känd bugg, se %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2130,7 +1913,7 @@ msgid "Events" msgstr "Händelser" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Namn" @@ -2158,15 +1941,15 @@ msgstr "Skapa fråga" msgid "Designer" msgstr "Designer" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Importera" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privilegier" @@ -2185,11 +1968,7 @@ msgid "" msgstr "Kan vara ungefärligt. Se FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Outnyttjat" @@ -2206,7 +1985,7 @@ msgstr "Servern svarar inte" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(eller den lokala MySQL-serverns socket är inte korrekt konfigurerad)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Detaljer..." @@ -2216,36 +1995,22 @@ msgid "Change password" msgstr "Byt lösenord" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Inget lösenord" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Lösenord" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Skriv igen" @@ -2260,20 +2025,12 @@ msgid "MySQL 4.0 compatible" msgstr "Kompatibel med MySQL 4.0" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Generera lösenord" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Generera" @@ -2286,17 +2043,23 @@ msgstr "Skapa ny databas" msgid "Create" msgstr "Skapa" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Inga privilegier" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Tabell måste ha åtminstone ett fält." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Skapa ny tabell i databas %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2361,11 +2124,7 @@ msgid "remember template" msgstr "kom ihåg mall" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Filens teckenuppsättning:" @@ -2376,7 +2135,7 @@ msgstr "Komprimering" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Inget" @@ -2423,11 +2182,7 @@ msgstr "" msgid "File to import" msgstr "Fil att importera" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Textfilens plats" @@ -2435,20 +2190,12 @@ msgstr "Textfilens plats" msgid "File uploads are not allowed on this server." msgstr "Filuppladdningar är inte tillåtna på denna server." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Katalogen som du konfigurerat för uppladdning kan inte nås" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "Uppladdningskatalog på webbserver" @@ -2584,11 +2331,7 @@ msgstr "Sortera efter nyckel" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Alternativ" @@ -2659,14 +2402,14 @@ msgstr "Visar rader " msgid "total" msgstr "totalt" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Frågan tog %01.4f sek" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Ändra" @@ -2736,11 +2479,7 @@ msgstr "Buffertanvändning" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Totalt" @@ -3024,11 +2763,7 @@ msgstr "" "bort. Annars döps de om och ges det näst högsta numret." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Format" @@ -3102,13 +2837,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Data" @@ -3157,15 +2887,9 @@ msgstr "MIME-typ" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Värd" @@ -3365,7 +3089,7 @@ msgstr "Standard för export" msgid "Open new phpMyAdmin window" msgstr "Öppna nytt phpMyAdmin-fönster" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Inga tabeller" @@ -3378,7 +3102,7 @@ msgstr "SQL-resultat" msgid "Generated by" msgstr "Genererad av" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL returnerade ett tomt resultat (dvs inga rader)." @@ -3529,20 +3253,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Primär" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Index" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Heltext" @@ -3767,6 +3491,10 @@ msgstr "Detta format har inga alternativ" msgid "not OK" msgstr "Inte OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Aktiverat" @@ -3788,7 +3516,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "Se dokumentationen för uppdatering av din tabell column_comments" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Bokmärkt SQL-fråga" @@ -3840,13 +3568,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Användarnamn" @@ -3864,22 +3587,14 @@ msgstr "Master-status" msgid "Slave status" msgstr "Slave-status" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Variabel" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Värde" @@ -3897,40 +3612,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Vilken användare som helst" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Använd textfältet" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Vilken värd som helst" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Lokal" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Denna värd" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Använd värdtabell" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3954,7 +3640,6 @@ msgid "Use Host Table" msgstr "Använd värdtabell" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3990,29 +3675,29 @@ msgstr "Okänt språk: %1$s." msgid "Servers" msgstr "Servrar" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Variabler" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Teckenuppsättningar" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Motorer" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Binär logg" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Processer" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -4042,51 +3727,51 @@ msgstr "" msgid "Target database" msgstr "Sök i databas" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "Kör SQL-fråga/frågor på server %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Kör SQL-fråga/frågor i databasen %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Kolumn-namn" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Skapa bokmärke för den här SQL-frågan" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Låt varje användare få tillgång till detta bokmärke" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Ersätt befintligt bokmärke med samma namn" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Skriv inte över denna fråga utifrån detta fönster" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Avgränsare" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Visa frågan här igen " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Sänd" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Visa endast" @@ -4264,13 +3949,13 @@ msgstr "Partitionsdefinition" msgid "Save" msgstr "Spara" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "Lägg till %s fält" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4484,8 +4169,8 @@ msgstr "Återställ" msgid "Protocol version" msgstr "Protokollversion" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Användare" @@ -4942,113 +4627,113 @@ msgstr "Lagringsmotorer" msgid "View dump (schema) of databases" msgstr "Visa SQL-satser för databaser" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Inkluderar alla privilegier utom GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Tillåter ändring av befintliga tabellers struktur." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Tillåter ändring och borttagning av lagrade rutiner." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Tillåter skapande av nya databaser och tabeller." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Tillåter skapande av lagrade rutiner." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Tillåter skapande av nya tabeller." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Tillåter skapande av temporära tabeller." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Tillåter skapande, borttagning och omdöpning av användarkonton." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Tillåter skapande av nya vyer." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Tillåter borttagning av data." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Tillåter borttagning av databaser och tabeller." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Tillåter borttagning av tabeller." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Tillåter skapande av händelser för händelseschemaläggaren" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Tillåter utförande av lagrade rutiner." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Tillåter import av data från och export av data till filer." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Tillåter tillägg av användare och privilegier utan omladdning av " "privilegiumtabellerna." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Tillåter skapande och borttagning av index." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Tillåter infogning och ersättning av data." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Tillåter låsning av tabeller för gällande tråd." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Begränsar antalet nya förbindelser användaren kan öppna per timme." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Begränsar antalet frågor användaren kan skicka till servern per timme." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5056,59 +4741,59 @@ msgstr "" "Begränsar antalet kommandon, vilka ändrar någon tabell eller databas, som " "användaren kan utföra per timme." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Begränsar antalet samtidiga förbindelser som användaren kan ha." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Tillåter visning av processer för alla användare" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Har ingen verkan i denna MySQL-version." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Tillåter omladdning av serverinställningar och rensning av serverns cache." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Ger användaren rätt att fråga var slav- / huvudservrarna är." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Nödvändigt för replikeringsslavar." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Tillåter läsning av data." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Ger tillgång till den fullständiga databaslistan." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Tillåter utförande av SHOW CREATE VIEW-frågor." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Tillåter avstängning av servern." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5118,158 +4803,158 @@ msgstr "" "Nödvändig för de flesta administrativa funktioner, som att sätta globala " "variabler eller döda andra användares trådar." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Tillåter skapande och borttagning av utlösare" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Tillåter ändring av data." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Inga privilegier." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Inget" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Tabellspecifika privilegier" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Obs! MySQL privilegiumnamn anges på engelska " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Globala privilegier" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Databasspecifika privilegier" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administration" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Resursbegränsningar" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" "Anm: Genom att sätta dessa alternativ till 0 (noll) tas begränsningarna bort." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Inloggningsinformation" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Ändra inte lösenordet" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Hittade ingen användare." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Användaren %s finns redan!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Du har lagt till en ny användare." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "Du har uppdaterat privilegierna för %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Du har upphävt privilegierna för %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Lösenordet för %s har ändrats." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Tar bort %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Inga användare valda för borttagning!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Laddar om privilegierna" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "De markerade användarna har tagits bort." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Privilegierna har laddats om." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Ändra privilegier" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Upphäv" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Användaröversikt" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Grant" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Vem som helst" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Lägg till ny användare" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Ta bort markerade användare" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Upphäv användarnas alla aktiva privilegier och ta bort användarna efteråt." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Ta bort databaserna med samma namn som användarna." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5282,51 +4967,51 @@ msgstr "" "privilegierna som servern använder ifall manuella ändringar har gjorts. I " "detta fall bör du %sladda om privilegierna%s innan du fortsätter." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Den markerade användaren kunde inte hittas i privilegiumtabellen." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Kolumnspecifika privilegier" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Lägg till privilegier till följande databas" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Jokertecknen _ och % måste föregås av ett \\ för att användas i egentlig " "betydelse" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Lägg till privilegier till följande tabell" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Ändra inloggningsinformation / Kopiera användare" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Skapa en ny användare med samma privilegier och ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... behåll den gamla." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... ta bort den gamla från användartabellerna." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... upphäv alla aktiva privilegier från dan gamla och ta bort den efteråt." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5334,44 +5019,44 @@ msgstr "" " ... ta bort den gamla från användartabellerna och ladda om privilegierna " "efteråt." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Databas för användare" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Inget" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Skapa databas med samma namn och ge alla privilegier" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Ge alla privilegier till namn med jokertecken (username\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "Bevilja alla privilegier för databas "%s"" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Användare som har tillgång till "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "global" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "databasspecifik" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "jokertecken" @@ -8295,25 +7980,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "Infogade rad id: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "Visar som PHP-kod" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "Visar SQL-fråga" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "Problem med index för tabell `%s`" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Etikett" @@ -8366,13 +8051,6 @@ msgstr "" msgid "Show insert query" msgstr "Visar SQL-fråga" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "och sedan" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Gå tillbaka till föregående sida" @@ -8455,7 +8133,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "Lägg till %s kolumn(er) till index" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Antalet kolumner måste vara större än noll." @@ -8569,41 +8247,6 @@ msgstr "Kontrollera referensintegritet:" msgid "Show tables" msgstr "Visa tabeller" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Utrymmesanvändning" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Användning" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Effektivt" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Radstatistik" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Uppgift" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "statisk" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dynamisk" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Radlängd" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Utrymmesanvändning" @@ -8637,7 +8280,6 @@ msgid "Row length" msgstr "Radlängd" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "Radstorlek" @@ -8713,50 +8355,50 @@ msgstr "Inget" msgid "Column %s has been dropped" msgstr "Tabellen %s har tagits bort" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "En primär nyckel har lagts till för %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Ett index har lagts till för %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Visa relationer" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Föreslå tabellstruktur" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "Lägg till %s fält" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "I slutet av tabellen" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "I början av tabellen" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Efter %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Skapa ett index för %s kolumn(er)" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "partitionerad" @@ -8798,6 +8440,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -9216,6 +8862,9 @@ msgstr "Döp om tabellen till" #~ msgid "Process list" #~ msgstr "Processlista" +#~ msgid "Reload privileges" +#~ msgstr "Ladda om privilegier" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/ta.po b/po/ta.po old mode 100755 new mode 100644 index dd4987dfc..9e2ffeb02 --- a/po/ta.po +++ b/po/ta.po @@ -6,11 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-04-16 10:43+0200\n" "Last-Translator: Sutharshan \n" "Language-Team: Tamil \n" @@ -22,11 +18,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "" @@ -114,7 +94,7 @@ msgstr "" msgid "Database %1$s has been created." msgstr "" -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "" @@ -139,17 +119,10 @@ msgstr "" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "" @@ -162,7 +135,7 @@ msgstr "" msgid "Null" msgstr "" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -186,24 +159,18 @@ msgstr "" msgid "Comments" msgstr "" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -212,15 +179,9 @@ msgstr "" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -239,149 +200,141 @@ msgstr "" msgid "No tables found in database." msgstr "" -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "%sஐ சேர்க்க" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "தானாக அதிகரிக்கும் பெறுமதியை சேர்க்க" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "தடைகளை சேர்க்க" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "" -#: db_operations.php:559 +#: db_operations.php:548 msgctxt "BLOB repository" msgid "Enabled" msgstr "" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 msgctxt "BLOB repository" msgid "Repair" msgstr "" -#: db_operations.php:585 +#: db_operations.php:574 msgctxt "BLOB repository" msgid "Disabled" msgstr "" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " "deactivated. To find out why click %shere%s." msgstr "" -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -390,11 +343,7 @@ msgstr "" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "" @@ -402,42 +351,30 @@ msgstr "" msgid "Size" msgstr "" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, php-format msgid "%s table" msgid_plural "%s tables" @@ -497,11 +434,7 @@ msgstr "" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "" @@ -535,120 +468,120 @@ msgstr "" msgid "SQL query on database %s:" msgstr "" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "அனுமதி நிராகரிக்கப்பட்டுள்ளது" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "" -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "" -#: db_search.php:367 +#: db_search.php:355 msgid "Inside column:" msgstr "" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "" @@ -658,117 +591,111 @@ msgstr "" msgid "Table %s has been emptied" msgstr "" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "" -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "" @@ -779,10 +706,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -802,8 +729,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "செயல்" @@ -837,8 +764,8 @@ msgstr "" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "" @@ -911,7 +838,7 @@ msgstr "" msgid "Showing bookmark" msgstr "" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "" @@ -990,268 +917,179 @@ msgstr "" msgid "The user name is empty!" msgstr "" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "புதிய பயனாளரை சேர்க்க" - -#: js/messages.php:47 -msgid "Create User" -msgstr "" - -#: js/messages.php:48 -msgid "Reloading Privileges" -msgstr "" - -#: js/messages.php:49 -msgid "Removing Selected Users" -msgstr "" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "விலக்கு" -#: js/messages.php:57 -msgid "Loading" -msgstr "" - -#: js/messages.php:58 -msgid "Processing Request" -msgstr "" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "" - -#: js/messages.php:65 -msgid "Renaming Databases" -msgstr "" - -#: js/messages.php:66 -msgid "Reload Database" -msgstr "" - -#: js/messages.php:67 -msgid "Copying Database" -msgstr "" - -#: js/messages.php:68 -msgid "Changing Charset" -msgstr "" - -#: js/messages.php:69 -#, fuzzy -#| msgid "You have added a new user." -msgid "Table must have atleast 1 column" -msgstr "நீங்கள் புதிய பயனாளரை சேர்த்துள்ளீர்கள்" - -#: js/messages.php:70 -msgid "Create Table" -msgstr "" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Warning" -msgid "Searching" -msgstr "எச்சரிக்கை" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 msgid "Choose column to display" msgstr "" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 msgid "Done" msgstr "" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 msgid "Prev" msgstr "" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 msgid "Today" msgstr "" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Jan" msgid "January" msgstr "தை" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "பங்குனி" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "சித்திரை" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "வைகாசி" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "ஆணி" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "ஆடி" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "ஆவணி" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "ஐப்பசி" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "தை" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "மாசி" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "பங்குனி" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "சித்திரை" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1259,174 +1097,174 @@ msgid "May" msgstr "வைகாசி" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "ஆணி" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "ஆடி" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "ஆவணி" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "புரட்டாதி" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "ஐப்பசி" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "காத்திகை" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "மார்கழி" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "ஞாயிறு" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "திங்கள்" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "செவ்வாய்" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "வெள்ளி" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "ஞாயிறு" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "திங்கள்" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "செவ்வாய்" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "புதன்" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "வியாழன்" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "வெள்ளி" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "சனி" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "ஞாயிறு" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "திங்கள்" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "செவ்வாய்" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "புதன்" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "வியாழன்" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "வெள்ளி" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "சனி" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 msgid "Minute" msgstr "" -#: js/messages.php:195 +#: js/messages.php:166 msgid "Second" msgstr "" @@ -1481,7 +1319,7 @@ msgstr "" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "" @@ -1499,7 +1337,7 @@ msgid "Comment" msgstr "" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1522,8 +1360,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "" @@ -1690,11 +1528,7 @@ msgstr "" msgid "Server Choice" msgstr "" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "" @@ -1769,11 +1603,7 @@ msgid "" "necessary extensions appear to be loaded. Check your PHP configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "" @@ -1868,7 +1670,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "" @@ -1882,136 +1684,136 @@ msgstr "" msgid "MySQL said: " msgstr "" -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "உள்வரிசை" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "B" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EiB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%B %d, %Y at %I:%M %p" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s நாட்கள் %s மணித்தியாலங்கள் %s நிமிடங்கள் மற்றும் %s செக்கன்கள்" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "" -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2030,7 +1832,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "" @@ -2058,15 +1860,15 @@ msgstr "" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "" @@ -2085,11 +1887,7 @@ msgid "" msgstr "" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "" @@ -2106,7 +1904,7 @@ msgstr "" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2116,36 +1914,22 @@ msgid "Change password" msgstr "" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "" @@ -2158,20 +1942,12 @@ msgid "MySQL 4.0 compatible" msgstr "" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "" @@ -2184,17 +1960,21 @@ msgstr "" msgid "Create" msgstr "" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +msgid "Table must have at least one column." +msgstr "" + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 msgid "Number of columns" msgstr "" @@ -2253,11 +2033,7 @@ msgid "remember template" msgstr "" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "" @@ -2268,7 +2044,7 @@ msgstr "" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "" @@ -2310,11 +2086,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "" @@ -2322,20 +2094,12 @@ msgstr "" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "" @@ -2462,11 +2226,7 @@ msgstr "" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "" @@ -2534,14 +2294,14 @@ msgstr "" msgid "total" msgstr "" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "" @@ -2607,11 +2367,7 @@ msgstr "" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "" @@ -2856,11 +2612,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "" @@ -2924,13 +2676,8 @@ msgstr "" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "" @@ -2979,15 +2726,9 @@ msgstr "" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "" @@ -3180,7 +2921,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "" @@ -3192,7 +2933,7 @@ msgstr "" msgid "Generated by" msgstr "" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "" @@ -3335,20 +3076,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "" @@ -3573,6 +3314,10 @@ msgstr "" msgid "not OK" msgstr "" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "" @@ -3594,7 +3339,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "" @@ -3645,13 +3390,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "" @@ -3668,22 +3408,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "" @@ -3701,40 +3433,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3758,7 +3461,6 @@ msgid "Use Host Table" msgstr "" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3792,29 +3494,29 @@ msgstr "" msgid "Servers" msgstr "" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3841,49 +3543,49 @@ msgstr "" msgid "Target database" msgstr "" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 msgid "Columns" msgstr "" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr "" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "" @@ -4025,13 +3727,13 @@ msgstr "" msgid "Save" msgstr "" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "%s களத்தை சேர்க்க" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have added a new user." msgid "You have to add at least one column." @@ -4165,8 +3867,8 @@ msgstr "" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "" @@ -4577,320 +4279,320 @@ msgstr "" msgid "View dump (schema) of databases" msgstr "" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "" -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "" -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "" -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "" -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "" -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "" -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "" -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "" -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "" -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "" -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "" -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "" -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "" -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "" -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "" -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." msgstr "" -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "" -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "" -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "" -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "" -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "" -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "" -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " "killing threads of other users." msgstr "" -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "" -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "" -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 msgctxt "None privileges" msgid "None" msgstr "" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr "" -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 msgid "No user found." msgstr "" -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "நீங்கள் புதிய பயனாளரை சேர்த்துள்ளீர்கள்" -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "" -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "" -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "" -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "" -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "புதிய பயனாளரை சேர்க்க" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "" -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -4899,89 +4601,89 @@ msgid "" "sreload the privileges%s before you continue." msgstr "" -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "" -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "பின்வரும் கொட்பிட்கான புதிய அனுமதியை சேர்க்க" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "" -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "" -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr "" -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 msgctxt "Create none database for user" msgid "None" msgstr "" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "" @@ -7551,25 +7253,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "" @@ -7619,13 +7321,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "" @@ -7704,7 +7399,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -7816,41 +7511,6 @@ msgstr "" msgid "Show tables" msgstr "" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "" @@ -7884,7 +7544,6 @@ msgid "Row length" msgstr "" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "" @@ -7949,49 +7608,49 @@ msgstr "" msgid "Column %s has been dropped" msgstr "" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "%s களத்தை சேர்க்க" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "%s பின்" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, php-format msgid "Create an index on  %s columns" msgstr "" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8033,6 +7692,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/te.po b/po/te.po old mode 100755 new mode 100644 index 787246953..f8209dd6a --- a/po/te.po +++ b/po/te.po @@ -6,11 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-05-26 14:20+0200\n" "Last-Translator: \n" "Language-Team: Telugu \n" @@ -22,11 +18,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "అన్నీ చూపించు" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -43,53 +39,37 @@ msgstr "" # Research అంటే పరిశోధన, అందువల్లన ఇది శోధనైంది #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "శోధించు" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "వెళ్ళు" @@ -115,7 +95,7 @@ msgstr "ఈ విలువని ఉపయోగించు" msgid "Database %1$s has been created." msgstr "" -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "" @@ -143,17 +123,10 @@ msgstr "ఆజ్ఞ" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "రకం" @@ -166,7 +139,7 @@ msgstr "రకం" msgid "Null" msgstr "" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -190,24 +163,18 @@ msgstr "" msgid "Comments" msgstr "వ్యాఖ్యలు" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "కాదు" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -216,15 +183,9 @@ msgstr "కాదు" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -243,154 +204,146 @@ msgstr "" msgid "No tables found in database." msgstr "" -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "" # మొదటి అనువాదము -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "డేటాబేస్ పేరు ఖాళీగా ఉన్నది" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "" # మొదటి అనువాదము -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "ఆజ్ఞ" -<<<<<<< HEAD -#: db_operations.php:466 -======= # మొదటి అనువాదము #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "మరియు తరువాత" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "స్థితి" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "End" msgctxt "BLOB repository" msgid "Enabled" msgstr "ముగింపు" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 msgctxt "BLOB repository" msgid "Repair" msgstr "" -#: db_operations.php:585 +#: db_operations.php:574 msgctxt "BLOB repository" msgid "Disabled" msgstr "" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " "deactivated. To find out why click %shere%s." msgstr "" -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -399,11 +352,7 @@ msgstr "పట్టిక" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "" @@ -412,42 +361,30 @@ msgid "Size" msgstr "పరిమాణం" # మొదటి అనువాదము -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "వాడుకలో ఉన్నది" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, php-format msgid "%s table" msgid_plural "%s tables" @@ -510,11 +447,7 @@ msgstr "" # మొదటి అనువాదము #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "లేదా" @@ -544,122 +477,122 @@ msgstr "" msgid "SQL query on database %s:" msgstr "" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "అన్ని పదాలూ" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "తొలగించు" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "మొత్తం: %s పోలిక(లు)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "" # మొదటి అనువాదము -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "వెతుకు" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "" -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "" -#: db_search.php:367 +#: db_search.php:355 msgid "Inside column:" msgstr "" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "" # మొదటి అనువాదము #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "ఖాళీ" @@ -669,25 +602,25 @@ msgstr "ఖాళీ" msgid "Table %s has been emptied" msgstr "" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -695,93 +628,87 @@ msgid "" msgstr "" # మొదటి అనువాదము -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "చూపుము" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "" # మొదటి అనువాదము -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "మొత్తము" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "" -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "" @@ -793,10 +720,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -816,8 +743,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "చర్య" @@ -851,8 +778,8 @@ msgstr "" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "" @@ -925,7 +852,7 @@ msgstr "" msgid "Showing bookmark" msgstr "" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "" @@ -1005,185 +932,80 @@ msgstr "" msgid "The user name is empty!" msgstr "వాడుకరి పేరులో ఏమీ లేదు" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "సంకేతపదం ఖాళీగా ఉంది!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "సంకేతపదాలు సరిపోలలేదు!" -# మొదటి అనువాదము -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "క్రొత్త వినియోగదారుని చేర్చు" - -# మొదటి అనువాదము -#: js/messages.php:47 -#, fuzzy -#| msgid "Create" -msgid "Create User" -msgstr "సృష్టించు" - -#: js/messages.php:48 -msgid "Reloading Privileges" -msgstr "" - -#: js/messages.php:49 -msgid "Removing Selected Users" -msgstr "" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "మూసివేయి" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "రద్దుచేయి" -#: js/messages.php:57 -#, fuzzy -#| msgid "Log in" -msgid "Loading" -msgstr "ప్రవేశించు" - -#: js/messages.php:58 -msgid "Processing Request" -msgstr "" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "సరే" - -# మొదటి అనువాదము -#: js/messages.php:65 -#, fuzzy -#| msgid "Database" -msgid "Renaming Databases" -msgstr "డేటాబేస్" - -# మొదటి అనువాదము -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "డేటాబేస్" - -# మొదటి అనువాదము -#: js/messages.php:67 -#, fuzzy -#| msgid "Database" -msgid "Copying Database" -msgstr "డేటాబేస్" - -# మొదటి అనువాదము -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "అక్షరమాల" - -# మొదటి అనువాదము -#: js/messages.php:69 -#, fuzzy -#| msgid "You have added a new user." -msgid "Table must have atleast 1 column" -msgstr "మీరు క్రొత్త వినియోగదారుని చేర్చారు" - -# మొదటి అనువాదము -#: js/messages.php:70 -#, fuzzy -#| msgid "Create a page" -msgid "Create Table" -msgstr "పుటని సృష్టించు" - -# Research అంటే పరిశోధన, అందువల్లన ఇది శోధనైంది -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "శోధించు" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 msgid "Choose column to display" msgstr "" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 msgid "Done" msgstr "" # మొదటి అనువాదము #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" @@ -1191,111 +1013,104 @@ msgstr "క్రితము" # మొదటి అనువాదము #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "తదుపరి" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "మొత్తం" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Jan" msgid "January" msgstr "జన" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "మార్చి" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "ఏప్రి" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "మే" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "జూన్" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "జూలై" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "ఆగ" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "అక్టో" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "జన" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "ఫిబ్ర" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "మార్చి" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "ఏప్రి" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1303,179 +1118,179 @@ msgid "May" msgstr "మే" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "జూన్" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "జూలై" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "ఆగ" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "సెప్టె" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "అక్టో" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "నవం" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "డిసెం" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "ఆది" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "సోమ" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "మంగళ" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "శుక్ర" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "ఆది" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "సోమ" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "మంగళ" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "బుధ" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "గురు" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "శుక్ర" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "శని" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "ఆది" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "సోమ" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "మంగళ" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "బుధ" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "గురు" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "శుక్ర" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "శని" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "వికీ" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" # మొదటి అనువాదము -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "వాడుకలో ఉన్నది" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1532,7 +1347,7 @@ msgstr "" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "" @@ -1550,7 +1365,7 @@ msgid "Comment" msgstr "వ్యాఖ్య" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1573,8 +1388,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "" @@ -1738,11 +1553,7 @@ msgstr "సంకేతపదం:" msgid "Server Choice" msgstr "" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "" @@ -1819,11 +1630,7 @@ msgid "" "necessary extensions appear to be loaded. Check your PHP configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "" @@ -1918,7 +1697,7 @@ msgstr "" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "" @@ -1932,138 +1711,138 @@ msgstr "" msgid "MySQL said: " msgstr "" -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "సమయం" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "" #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "" #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%B %d, %Y at %I:%M %p" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s రోజులు, %s గంటలు, %s నిమిషాలు మరియు %s క్షణాలు" # మొదటి అనువాదము -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "మొదలు" # మొదటి అనువాదము -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "క్రితము" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "ముగింపు" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "" -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2082,7 +1861,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "పేరు" @@ -2110,15 +1889,15 @@ msgstr "" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "" @@ -2137,11 +1916,7 @@ msgid "" msgstr "" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "" @@ -2158,7 +1933,7 @@ msgstr "" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "వివరాలు..." @@ -2168,36 +1943,22 @@ msgid "Change password" msgstr "" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "సంకేతపదం లేదు" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "సంకేతపదం" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "" @@ -2210,20 +1971,12 @@ msgid "MySQL 4.0 compatible" msgstr "" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "" @@ -2237,17 +1990,21 @@ msgstr "" msgid "Create" msgstr "సృష్టించు" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +msgid "Table must have at least one column." +msgstr "" + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 msgid "Number of columns" msgstr "" @@ -2306,11 +2063,7 @@ msgid "remember template" msgstr "" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "" @@ -2321,7 +2074,7 @@ msgstr "" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "" @@ -2363,11 +2116,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "పాఠ్యపు దస్త్రం యొక్క ప్రాంతం" @@ -2375,20 +2124,12 @@ msgstr "పాఠ్యపు దస్త్రం యొక్క ప్రా msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "" @@ -2515,11 +2256,7 @@ msgstr "" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "" @@ -2588,7 +2325,7 @@ msgstr "" msgid "total" msgstr "మొత్తం" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "" @@ -2596,7 +2333,7 @@ msgstr "" # మొదటి అనువాదము #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "మార్చుము" @@ -2662,11 +2399,7 @@ msgstr "" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "మొత్తం" @@ -2913,11 +2646,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "" @@ -2981,13 +2710,8 @@ msgstr "" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "" @@ -3036,15 +2760,9 @@ msgstr "" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "" @@ -3238,7 +2956,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "" @@ -3250,7 +2968,7 @@ msgstr "" msgid "Generated by" msgstr "" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "" @@ -3395,20 +3113,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "" @@ -3645,6 +3363,10 @@ msgstr "" msgid "not OK" msgstr "" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "సరే" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "" @@ -3666,7 +3388,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "" @@ -3717,13 +3439,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "వాడుకరి పేరు" @@ -3740,22 +3457,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "విలువ" @@ -3774,40 +3483,11 @@ msgid "Add slave replication user" msgstr "" # మొదటి అనువాదము -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "ఏ వాడుకరి ఐనను" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "స్థానిక" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3831,7 +3511,6 @@ msgid "Use Host Table" msgstr "" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3865,29 +3544,29 @@ msgstr "" msgid "Servers" msgstr "" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3914,51 +3593,51 @@ msgstr "తేడా" msgid "Target database" msgstr "" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Comments" msgid "Columns" msgstr "వ్యాఖ్యలు" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr "" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "దాఖలుచేయి" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "" @@ -4103,14 +3782,14 @@ msgid "Save" msgstr "భద్రపరచు" # మొదటి అనువాదము -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add into comments" msgid "Add %s column(s)" msgstr "స్పందనలకు చేర్చు" # మొదటి అనువాదము -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have added a new user." msgid "You have to add at least one column." @@ -4244,8 +3923,8 @@ msgstr "" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "వాడుకరి" @@ -4668,325 +4347,325 @@ msgstr "" msgid "View dump (schema) of databases" msgstr "" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "" -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "" -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "" -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "" -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "" -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "" -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "" -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "" -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "" -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "" -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "" -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "" -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "" -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "" -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "" -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." msgstr "" -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "" -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "" -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "" -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "" -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "" -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "" -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " "killing threads of other users." msgstr "" -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "" -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "" -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "No" msgctxt "None privileges" msgid "None" msgstr "కాదు" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr "" -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "పరిపాలన" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "ప్రవేశపు సమాచారం" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 msgid "No user found." msgstr "" -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "" # మొదటి అనువాదము -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "మీరు క్రొత్త వినియోగదారుని చేర్చారు" -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "" -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "" -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "" -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "" -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "" # మొదటి అనువాదము -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "ఏదైనను" # మొదటి అనువాదము -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "క్రొత్త వినియోగదారుని చేర్చు" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "" -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -4995,92 +4674,92 @@ msgid "" "sreload the privileges%s before you continue." msgstr "" -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "" -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "" # మొదటి అనువాదము -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... పాతదే ఉంచుము" -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr "" -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "No" msgctxt "Create none database for user" msgid "None" msgstr "కాదు" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "" @@ -7662,25 +7341,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "" @@ -7731,14 +7410,6 @@ msgid "Show insert query" msgstr "" # మొదటి అనువాదము -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "మరియు తరువాత" - -# మొదటి అనువాదము -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "మునుపటి పుటకు వెళ్ళు" @@ -7818,7 +7489,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -7931,41 +7602,6 @@ msgstr "" msgid "Show tables" msgstr "" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "వాడుక" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "వరుసల గణాంకాలు" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "" @@ -7999,7 +7635,6 @@ msgid "Row length" msgstr "" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "" @@ -8068,51 +7703,51 @@ msgstr "కాదు" msgid "Column %s has been dropped" msgstr "" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "" # మొదటి అనువాదము -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add into comments" msgid "Add column" msgstr "స్పందనలకు చేర్చు" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "" # మొదటి అనువాదము -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "%s మార్లు తరువాత" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, php-format msgid "Create an index on  %s columns" msgstr "" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8154,6 +7789,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "మూసివేయి" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/th.po b/po/th.po old mode 100755 new mode 100644 index 7f5aecf85..c1bd07cca --- a/po/th.po +++ b/po/th.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:19+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: thai \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "แสดงทั้งหมด" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -38,53 +34,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "ค้นหา" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "ลงมือ" @@ -110,7 +90,7 @@ msgstr "ใช้ค่านี้" msgid "Database %1$s has been created." msgstr "โยนฐานข้อมูล %s ทิ้งไปเรียบร้อยแล้ว" -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "หมายเหตุของฐานข้อมูล: " @@ -137,17 +117,10 @@ msgstr "ชื่อคอลัมน์" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "ชนิด" @@ -160,7 +133,7 @@ msgstr "ชนิด" msgid "Null" msgstr "ว่างเปล่า (null)" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -184,24 +157,18 @@ msgstr "เชื่อมไปยัง" msgid "Comments" msgstr "หมายเหตุ" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "ไม่" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -210,15 +177,9 @@ msgstr "ไม่" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -237,145 +198,137 @@ msgstr "ดูโครงสร้างของฐานข้อมูล" msgid "No tables found in database." msgstr "ไม่พบตารางใด ๆ ในฐานข้อมูล" -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "เลือกทั้งหมด" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "ไม่เลือกเลย" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 #, fuzzy msgid "The database name is empty!" msgstr "ชื่อตารางยังว่างอยู่!" -#: db_operations.php:241 +#: db_operations.php:236 #, fuzzy, php-format msgid "Database %s has been renamed to %s" msgstr "ตาราง %s ได้ถูกเปลี่ยนชื่อเป็น %s" -#: db_operations.php:245 +#: db_operations.php:240 #, fuzzy, php-format msgid "Database %s has been copied to %s" msgstr "คัดลอกตาราง %s ไปเก็บในชื่อ %s เรียบร้อยแล้ว." -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "เปลี่ยนชื่อฐานข้อมูลเป็น" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "คำสั่ง" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "" #: db_operations.php:455 ->>>>>>> origin/master #, fuzzy msgid "Copy database to" msgstr "เปลี่ยนชื่อฐานข้อมูลเป็น" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "เฉพาะโครงสร้าง" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "ทั้งโครงสร้างและข้อมูล" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "เฉพาะข้อมูล" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "เพิ่มค่า AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "" -#: db_operations.php:507 +#: db_operations.php:496 #, fuzzy msgid "Switch to copied database" msgstr "สลับไปที่ตารางที่ถูกทำสำเนาไว้" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "สถานะ" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "เปิดใช้อยู่" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "ระงับการใช้อยู่" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "ซ่อมแซมตาราง" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "ระงับการใช้อยู่" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "เปิดใช้อยู่" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "การเรียงลำดับ" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -383,14 +336,14 @@ msgid "" msgstr "" "ความสามารถเพิ่มเติมสำหรับ linked Tables ได้ถูกระงับเอาไว้ ตามเหตุผลที่แจ้งไว้ใน %shere%s" -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "แก้ไขหน้า PDF" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -399,11 +352,7 @@ msgstr "ตาราง " #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "แถว" @@ -411,42 +360,30 @@ msgstr "แถว" msgid "Size" msgstr "ขนาด" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "ใช้อยู่" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "สร้างเมื่อ" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "ปรับปรุงครั้งสุดท้ายเมื่อ" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "ตรวจสอบครั้งสุดท้ายเมื่อ" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -507,11 +444,7 @@ msgstr "ลบ" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "หรือ" @@ -545,85 +478,85 @@ msgstr "ใช้ตาราง" msgid "SQL query on database %s:" msgstr "คำค้นบนฐานข้อมูล %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "ประมวลผลคำค้น" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "ไม่อนุญาตให้ใช้งาน" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "อย่างน้อยหนึ่งคำ" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "ทุกคำ" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "เหมือนทั้งวลี" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "รูปแบบคำพ้อง (regular expression)" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "ผลการค้นหา \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "พบ %s ผลลัพธ์ที่ตรงในตาราง %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "เปิดดู" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "ลบ" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "รวม: %s ผลลัพธ์ที่ตรง" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "ค้นหาในฐานข้อมูล" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "คำ หรือ ค่าที่ต้องการค้นหา (wildcard: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "ค้น:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "คำถูกแบ่งด้วยช่องว่าง (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "ในตาราง:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -631,36 +564,36 @@ msgstr "ในตาราง:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "แทรก" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "โครงสร้าง" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "โยนทิ้ง" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "ลบข้อมูล" @@ -670,118 +603,112 @@ msgstr "ลบข้อมูล" msgid "Table %s has been emptied" msgstr "ลบข้อมูลในตาราง %s เรียบร้อยแล้ว" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, fuzzy, php-format msgid "View %s has been dropped" msgstr "โยนฟิลด์ %s ทิ้งไปเรียบร้อยแล้ว" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "โยนตาราง %s ทิ้งไปเรียบร้อยแล้ว" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 #, fuzzy msgid "Replication" msgstr "รีเลชัน" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "ผลรวม" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "" -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "ทำกับที่เลือก:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "เลือกทั้งหมด" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "ไม่เลือกเลย" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "แสดง" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "ตรวจสอบตาราง" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "ปรับแต่งตาราง" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "ซ่อมแซมตาราง" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "วิเคราะห์ตาราง" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "ส่งออก" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "พจนานุกรมข้อมูล" @@ -792,10 +719,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -816,8 +743,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "กระทำการ" @@ -853,8 +780,8 @@ msgstr "เฉพาะโครงสร้าง" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "ตรวจสอบตาราง" @@ -929,7 +856,7 @@ msgstr "ลบคำค้นที่จดไว้เรียบร้อย msgid "Showing bookmark" msgstr "" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "" @@ -1008,293 +935,189 @@ msgstr "ชื่อโฮสต์ยังว่างอยู่!" msgid "The user name is empty!" msgstr "ชื่อผู้ใช้ยังว่างอยู่!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "รหัสผ่านยังว่างอยู่!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "รหัสผ่านไม่ตรงกัน!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "เพิ่มผู้ใช้ใหม่" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "รุ่นของเซิร์ฟเวอร์" - -#: js/messages.php:48 -#, fuzzy -msgid "Reloading Privileges" -msgstr "สิทธิแบบโกลบอล" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "ถอนผู้ใช้ที่เลือก" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "โลคอล" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "โพรเซส" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "ตกลง" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "เปลี่ยนชื่อฐานข้อมูลเป็น" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "ฐานข้อมูล" - -#: js/messages.php:67 -#, fuzzy -msgid "Copying Database" -msgstr "เปลี่ยนชื่อฐานข้อมูลเป็น" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "ชุดตัวอักษร" - -#: js/messages.php:69 -#, fuzzy -#| msgid "You have to choose at least one column to display" -msgid "Table must have atleast 1 column" -msgstr "ต้องเลือกให้แสดงอย่างน้อยหนึ่งคอลัมน์" - -#: js/messages.php:70 -#, fuzzy -msgid "Create Table" -msgstr "เริ่มหน้าใหม่" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "ค้นหา" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "บันทึกการแก้ไขเรียบร้อยแล้ว" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 #, fuzzy msgid "Relation deleted" msgstr "มุมมองรีเลชัน" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 #, fuzzy msgid "Internal relation added" msgstr "รีเลชันภายใน" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "ความสามารถด้านรีเลชันทั่วไป" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "ระงับการใช้อยู่" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "เลือกฟิลด์ที่ต้องการแสดง" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "ไม่มี" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "ก่อนหน้า" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "ต่อไป" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "รวม" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr " ข้อมูลไบนารี " -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "มี.ค." -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "เม.ย." -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "พ.ค." -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "มิ.ย." -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "ก.ค." -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "ส.ค." -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "ต.ค." -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "ม.ค." #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "ก.พ." #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "มี.ค." #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "เม.ย." #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1302,176 +1125,176 @@ msgid "May" msgstr "พ.ค." #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "มิ.ย." #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "ก.ค." #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "ส.ค." #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "ก.ย." #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "ต.ค." #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "พ.ย." #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "ธ.ค." -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "อา." -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "จ." -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "อ." -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "ศ." -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "อา." #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "จ." #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "อ." #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "พ." #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "พฤ." #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "ศ." #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "ส." #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "อา." #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "จ." #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "อ." #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "พ." #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "พฤ." #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "ศ." #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "ส." #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "ใช้อยู่" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1528,7 +1351,7 @@ msgstr "ดัชนี" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "เอกลักษณ์" @@ -1547,7 +1370,7 @@ msgid "Comment" msgstr "หมายเหตุ" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1570,8 +1393,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "ฐานข้อมูล" @@ -1735,11 +1558,7 @@ msgstr "รหัสผ่าน:" msgid "Server Choice" msgstr "ตัวเลือกเซิร์ฟเวอร์" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "ต้องอนุญาตใช้ใช้ 'คุ๊กกี้' (cookie) เสียก่อน จึงจะผ่านจุดนี้ไปได้" @@ -1818,11 +1637,7 @@ msgstr "" "ไม่สามารถใช้ฟังก์ชั่น iconv หรือ libiconv หรือ recode_string ทั้งๆ ที่สามารถเรียกตัวช่วย " "สำหรับฟังก์ชั่นเหล่านั้นขึ้นมาได้แล้ว. ลองตรวจสอบการตั้งค่าของ PHP" -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
ถ้าคุณเห็นหน้าว่างๆ แสดงว่าทุกอย่างเป็นปกติดี" -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" msgstr "ต้องกำหนดค่า $cfg['PmaAbsoluteUri'] ในไฟล์คอนฟิกูเรชั่นเสียก่อน" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "เซิร์ฟเวอร์" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "" @@ -1924,7 +1711,7 @@ msgstr "ถูกส่ง" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "เอกสารอ้างอิง" @@ -1938,136 +1725,136 @@ msgstr "คำค้น SQL" msgid "MySQL said: " msgstr "MySQL แสดง: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "อธิบาย SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "ไม่ต้องอธิบาย SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "ไม่เอาโค้ด PHP" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "สร้างโค้ด PHP" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "เรียกใหม่" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "ไม่ต้องตรวจสอบ SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "ตรวจสอบ SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "เวลา" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "ไบต์" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "กิโลไบต์" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "เมกกะไบต์" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "กิกะไบต์" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "เทอราไบต์" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "เพตตะไบต์" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "เอกซะไบต์" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d %B %Y %Rน." -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s วัน, %s ชั่วโมง, %s นาที, %s วินาที" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "จุดเริ่มต้น" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "ก่อนหน้า" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "ท้ายสุด" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "กระโดดไปที่ฐานข้อมูล "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2086,7 +1873,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "ชื่อ" @@ -2114,16 +1901,16 @@ msgstr "คำค้นจากตัวอย่าง" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 #, fuzzy msgid "Import" msgstr "ส่งออก" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "สิทธิ" @@ -2142,11 +1929,7 @@ msgid "" msgstr "" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "เกินความจำเป็น" @@ -2163,7 +1946,7 @@ msgstr "เซิร์ฟเวอร์ดังกล่าวไม่ตอ msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2173,36 +1956,22 @@ msgid "Change password" msgstr "เปลี่ยนรหัสผ่าน" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "ไม่มีรหัสผ่าน" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "รหัสผ่าน" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "พิมพ์ใหม่" @@ -2215,20 +1984,12 @@ msgid "MySQL 4.0 compatible" msgstr "" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master #, fuzzy msgid "Generate" msgstr "สร้างโดย" @@ -2242,17 +2003,23 @@ msgstr "สร้างฐานข้อมูลใหม่" msgid "Create" msgstr "สร้าง" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "ไม่มีสิทธิ" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "You have to choose at least one column to display" +msgid "Table must have at least one column." +msgstr "ต้องเลือกให้แสดงอย่างน้อยหนึ่งคอลัมน์" + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "สร้างตารางในฐานข้อมูลนี้ %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of rows per page" msgid "Number of columns" @@ -2315,11 +2082,7 @@ msgid "remember template" msgstr "จำรูปแบบ" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "ชุดอักขระของไฟล์ (character set):" @@ -2330,7 +2093,7 @@ msgstr "บีบอัดข้อมูล" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "ไม่มี" @@ -2372,11 +2135,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "เลือกไฟล์ข้อความจาก" @@ -2384,20 +2143,12 @@ msgstr "เลือกไฟล์ข้อความจาก" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "ไม่สามารถใช้งาน ไดเรกทอรีที่ตั้งไว้สำหรับอัพโหลดได้" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "ไดเรกทอรีสำหรับอัพโหลด ที่เว็บเซิร์ฟเวอร์" @@ -2526,11 +2277,7 @@ msgstr "เรียงโดยคีย์" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "กระบวนการ" @@ -2603,14 +2350,14 @@ msgstr "แสดงระเบียนที่ " msgid "total" msgstr "ทั้งหมด" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "คำค้นใช้เวลา %01.4f วินาที" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "เปลี่ยน" @@ -2678,11 +2425,7 @@ msgstr "" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "รวม" @@ -2928,11 +2671,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "รูปแบบ" @@ -3004,13 +2743,8 @@ msgstr "" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "ข้อมูล" @@ -3059,15 +2793,9 @@ msgstr "MIME-type" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "โฮสต์" @@ -3266,7 +2994,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "ไม่มีตาราง" @@ -3279,7 +3007,7 @@ msgstr "ผลลัพธ์ SQL" msgid "Generated by" msgstr "สร้างโดย" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL คืนผลลัพธ์ว่างเปล่ากลับมา (null / 0 แถว)." @@ -3426,20 +3154,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "ไพรมารี" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "ดัชนี" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "ข้อความเต็ม (fulltext)" @@ -3665,6 +3393,10 @@ msgstr "รูปแบบนี้ไม่มีตัวเลือก" msgid "not OK" msgstr "ไม่ตกลง" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "ตกลง" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "เปิดใช้อยู่" @@ -3688,7 +3420,7 @@ msgstr "" "โปรดอ่านเอกสารเกี่ยวกับ วิธีการปรับปรุงตาราง Column_comments (เก็บหมายเหตุของคอลัมน์) " "ของคุณ" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "คำค้นนี้ถูกจดไว้แล้ว" @@ -3739,13 +3471,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "ชื่อผู้ใช้" @@ -3763,22 +3490,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "ตัวแปร" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "ค่า" @@ -3797,40 +3516,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "ผู้ใช้ใดๆ" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "ใช้ช่องใส่ข้อความ (text field)" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "โฮสต์ใดๆ" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "โลคอล" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "โฮสต์นี้" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3854,7 +3544,6 @@ msgid "Use Host Table" msgstr "" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3889,30 +3578,30 @@ msgstr "" msgid "Servers" msgstr "เซิร์ฟเวอร์" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "ตัวแปร" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "ชุดตัวอักษร" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 #, fuzzy msgid "Binary log" msgstr " ข้อมูลไบนารี " -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "โพรเซส" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3941,51 +3630,51 @@ msgstr "" msgid "Target database" msgstr "ค้นหาในฐานข้อมูล" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, fuzzy, php-format msgid "Run SQL query/queries on server %s" msgstr "ประมวลผลคำค้นบนฐานข้อมูล %s" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "ประมวลผลคำค้นบนฐานข้อมูล %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "ชื่อคอลัมน์" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "จดคำค้นนี้ไว้" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " แสดงคำค้นนี้อีกที " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "ส่ง" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "ดูอย่างเดียว" @@ -4154,12 +3843,12 @@ msgstr "" msgid "Save" msgstr "บันทึก" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format msgid "Add %s column(s)" msgstr "เพิ่มฟิลด์ใหม่" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to add at least one column." @@ -4301,8 +3990,8 @@ msgstr "เริ่มใหม่" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "ผู้ใช้" @@ -4736,330 +4425,330 @@ msgstr "" msgid "View dump (schema) of databases" msgstr "ดูโครงสร้างของฐานข้อมูล" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "ให้สิทธิทุกอย่าง ยกเว้นการให้สิทธิแก่ผู้อื่น (GRANT)." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "อนุญาตให้เปลี่ยนโครงสร้างของตารางที่มีอยู่เดิม." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 #, fuzzy msgid "Allows altering and dropping stored routines." msgstr "อนุญาตให้สร้าง และทิ้ง ดัชนี" -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "อนุญาตให้สร้างฐานข้อมูล และตารางใหม่." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 #, fuzzy msgid "Allows creating stored routines." msgstr "อนุญาตให้สร้างตารางใหม่." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "อนุญาตให้สร้างตารางใหม่." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "อนุญาตให้สร้างตารางชั่วคราว." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 #, fuzzy msgid "Allows creating new views." msgstr "อนุญาตให้สร้างตารางใหม่." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "อนุญาตให้ลบข้อมูล" -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "อนุญาตให้ทิ้งฐานข้อมูล และตาราง" -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "อนุญาตให้ทิ้งตาราง" -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "อนุญาตให้นำเข้าข้อมูล และส่งออกข้อมูล ไปที่ไฟล์" -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "อนุญาตให้เพิ่มผู้ใช้ และสิทธิเข้าถึง โดยไม่ต้องเรียกใช้ตารางสิทธิใหม่" -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "อนุญาตให้สร้าง และทิ้ง ดัชนี" -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "อนุญาตให้เพิ่ม และแทนที่ ข้อมูล" -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "อนุญาตให้ล็อกตารางสำหรับเธรดปัจจุบัน" -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "จำกัดจำนวนการเชื่อมต่อใหม่ ที่ผู้ใช้จะสามารถเปิดได้ ต่อชั่วโมง" -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "จำกัดจำนวนของคำค้น ที่ผู้ใช้จะสามารถส่งมาที่เซิร์ฟเวอร์ได้ ต่อชั่วโมง" -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." msgstr "" "จำกัดจำนวนของคำสั่ง ที่จะเปลี่ยนแปลงตาราง หรือฐานข้อมูลใดๆ ที่ผู้ใช้จะสามารถสั่งได้ ต่อชั่วโมง" -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 #, fuzzy msgid "Limits the number of simultaneous connections the user may have." msgstr "จำกัดจำนวนการเชื่อมต่อใหม่ ที่ผู้ใช้จะสามารถเปิดได้ ต่อชั่วโมง" -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "ไม่มีผลใน MySQL รุ่นนี้" -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "อนุญาตให้เรียกใช้ค่ากำหนดของเซิร์ฟเวอร์ใหม่ และล้างแคชของเซิร์ฟเวอร์" -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "มอบสิทธิให้ผู้ใช้ ในการถามว่า slaves หรือ masters อยู่ที่ไหน." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "" -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "อนุญาตให้อ่านข้อมูลได้." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "สามารถเรียกดูรายการฐานข้อมูลทั้งหมดได้" -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "อนุญาตให้ปิดเซิร์ฟเวอร์ได้" -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " "killing threads of other users." msgstr "" -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "อนุญาตให้สร้าง และทิ้ง ดัชนี" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "อนุญาตให้เปลี่ยนข้อมูลได้." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "ไม่มีสิทธิใดๆ." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "ไม่มี" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "สิทธิเจาะจงเฉพาะตาราง" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " โปรดทราบ: ชื่อของสิทธิใน MySQL จะแสดงเป็นภาษาอังกฤษ " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "สิทธิแบบโกลบอล" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "สิทธิเจาะจงเฉพาะฐานข้อมูล" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "การดูแลระบบ" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "ขีดจำกัดของทรัพยากร" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "โปรดทราบ: ถ้าเปลี่ยนค่าเหล่านี้เป็น 0 (ศูนย์) จะหมายถึง ไม่มีขีดจำกัด." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "ข้อมูลล็อกอิน" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "กรุณาอย่าเปลี่ยนรหัสผ่าน" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "ไม่พบผู้ใช้ใดๆ." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "มีผู้ใช้ %s อยู่แล้ว!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "เพิ่มผู้ใช้ใหม่เรียบร้อยแล้ว" -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "คุณได้ปรับปรุงสิทธิสำหรับ %s แล้ว" -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "คุณได้เพิกถอนสิทธิของ %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "เปลี่ยนรหัสผ่านของ %s เรียบร้อยแล้ว" -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "กำลังลบ %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "ปรับปรุงสิทธิเข้าถึงใหม่อีกรอบ" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "ลบผู้ใช้ที่เลือกไว้เรียบร้อยแล้ว." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "สิทธิได้ถูกเรียกใช้ใหม่เรียบร้อยแล้ว" -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "แก้ไขสิทธิ" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "เพิกถอน" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "ข้อมูลทั่วไปของผู้ใช้" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "มอบสิทธิ" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "ใดๆ" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "เพิ่มผู้ใช้ใหม่" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "ถอนผู้ใช้ที่เลือก" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "เพิกถอน active privileges ทั้งหมดจากผู้ใช้ และลบผู้ใช้ทิ้งหลังจากนั้น." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "โยนฐานข้อมูลที่มีชื่อเดียวกับผู้ใช้ทิ้ง." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5068,91 +4757,91 @@ msgid "" "sreload the privileges%s before you continue." msgstr "" -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "ไม่พบผู้ใช้ที่เลือกในตารางแสดงสิทธิ" -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "สิทธิเฉพาะคอลัมน์" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "เพิ่มสิทธิของฐานข้อมูลต่อไปนี้" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "เพิ่มสิทธิของตารางต่อไปนี้" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "เปลี่ยนข้อมูลล็อกอิน / ทำสำเนาผู้ใช้" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "สร้างผู้ใช้ใหม่ ให้มีสิทธิเหมือนกัน และ ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... เก็บของเก่าไว้." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... ลบของเก่าทิ้งไปจากตารางผู้ใช้." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... เรียกคืนสิทธิ์ทั้งหมดจากเดิม แล้วลบมันหลังจากนั้น." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr " ... ลบของเก่าจากตารางผู้ใช้ แล้วเรียกใช้รายการสิทธิ์ใหม่หลังจากนั้น." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "ไม่มี" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "ตรวจสอบสิทธิสำหรับฐานข้อมูล "%s"." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "ผู้ใช้มีสิทธิเข้าถึงฐานข้อมูล "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "โกลบอล" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "เฉพาะฐานข้อมูล" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "ไวล์การ์ด" @@ -7770,25 +7459,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "ป้ายชื่อ" @@ -7840,13 +7529,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "ส่งกลับ" @@ -7926,7 +7608,7 @@ msgstr "(ชื่อของไพรมารีคีย์จะต้ msgid "Add to index  %s column(s)" msgstr "เพิ่มดัชนีคอลัมน์ %s" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -8043,41 +7725,6 @@ msgstr "ตรวจสอบความสมบูรณ์ของการ msgid "Show tables" msgstr "แสดงตาราง" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "เนื้อที่ที่ใช้" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "ใช้งาน" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "มีผล" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "สถิติของแถว" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "คำสั่ง" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "ไม่คงที่" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "ความยาวแถว" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "เนื้อที่ที่ใช้" @@ -8111,7 +7758,6 @@ msgid "Row length" msgstr "ความยาวแถว" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " ขนาดแถว " @@ -8184,49 +7830,49 @@ msgstr "ไม่มี" msgid "Column %s has been dropped" msgstr "โยนตาราง %s ทิ้งไปเรียบร้อยแล้ว" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "ได้เพิ่มไพรมารีคีย์แล้วใน %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "ได้เพิ่มดัชนีแล้วใน %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "มุมมองรีเลชัน" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "เสนอโครงสร้างตาราง" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy msgid "Add column" msgstr "เพิ่มฟิลด์ใหม่" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "ที่จุดสุดท้ายของตาราง" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "ที่จุดเริ่มต้นของตาราง" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "หลัง %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "สร้างดัชนีโดยคอลัมน์ %s" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8268,6 +7914,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8601,6 +8251,10 @@ msgstr "เปลี่ยนชื่อตารางเป็น" #~ msgid "Process list" #~ msgstr "รายการโพรเซส" +#, fuzzy +#~ msgid "Reload privileges" +#~ msgstr "สิทธิแบบโกลบอล" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/tr.po b/po/tr.po old mode 100755 new mode 100644 index d1ea88ac9..d1e276fdf --- a/po/tr.po +++ b/po/tr.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-06-21 19:58+0200\n" "Last-Translator: Burak \n" "Language-Team: turkish \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Tümünü göster" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Ara" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Git" @@ -114,7 +94,7 @@ msgstr "Bu değeri kullan" msgid "Database %1$s has been created." msgstr "Veritabanı %1$s oluşturuldu." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Veritabanı yorumu:" @@ -139,17 +119,10 @@ msgstr "Sütun" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Türü" @@ -162,7 +135,7 @@ msgstr "Türü" msgid "Null" msgstr "Boş" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -186,24 +159,18 @@ msgstr "Şuna bağlantı ver ->" msgid "Comments" msgstr "Yorumlar" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Hayır" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -212,15 +179,9 @@ msgstr "Hayır" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -239,147 +200,127 @@ msgstr "Veritabanının dökümünü (şemasını) göster" msgid "No tables found in database." msgstr "Veritabanında tablo bulunamadı." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Tümünü Seç" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Tüm Seçimi Kaldır" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Veritabanı adı boş!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "%s veritabanı %s olarak yeniden adlandırıldı" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "%s veritabanı %s'e kopyalandı" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Veritabanını şuna yeniden adlandır" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Komut" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "ve sonra" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Veritabanını şuraya kopyala:" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Sadece yapı" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Yapı ve veri" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Sadece veri" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "Kopyalamadan önce VERİTABANI OLUŞTUR" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "%s komutu ekle" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "AUTO_INCREMENT değeri ekle" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Kısıtlamaları ekle" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Kopyalanmış veritabanına geç" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "BLOB Havuzu" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Durum" -<<<<<<< HEAD -#: db_operations.php:559 -======= #: db_operations.php:548 ->>>>>>> origin/master msgctxt "BLOB repository" msgid "Enabled" msgstr "Etkinleştirildi" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Etkisiz" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Hasarlı" -<<<<<<< HEAD -#: db_operations.php:577 -======= #: db_operations.php:566 ->>>>>>> origin/master msgctxt "BLOB repository" msgid "Repair" msgstr "Onar" -<<<<<<< HEAD -#: db_operations.php:585 -======= #: db_operations.php:574 ->>>>>>> origin/master msgctxt "BLOB repository" msgid "Disabled" msgstr "Etkisizleştirildi" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Etkin" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Karşılaştırma" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -388,14 +329,14 @@ msgstr "" "Bağlı tablolar ile çalışan ilave özellikler etkisizleştirildi. Nedenini " "öğrenmek için %sburaya%s tıklayın." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "PDF Sayfalarını düzenle" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -404,11 +345,7 @@ msgstr "Tablo" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Satır" @@ -416,42 +353,30 @@ msgstr "Satır" msgid "Size" msgstr "Boyut" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "kullanımda" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Oluşturma" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Son güncellenme" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Son kontrol" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, php-format msgid "%s table" msgid_plural "%s tables" @@ -510,11 +435,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Veya" @@ -544,124 +465,120 @@ msgstr "Tabloları kullan" msgid "SQL query on database %s:" msgstr "%s veritabanındaki SQL sorgusu:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Sorguyu Gönder" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Erişim engellendi" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "kelimelerin en azından biri" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "tüm kelimeler" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "kesin ifade" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "kurallı ifade olarak" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "\"%s\" %s için arama sonuçları:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s eşleşme, %s tablosu içinde" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Gözat" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Sil" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Toplam: %s eşleşme" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Veritabanında ara" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Aranacak kelime(ler) veya değer(ler) (joker: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Bul:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Kelimeler boşlukla ayrılır (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Tablo içindeki(ler):" -<<<<<<< HEAD -#: db_search.php:367 -======= #: db_search.php:355 ->>>>>>> origin/master msgid "Inside column:" msgstr "İç sütun:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Ekle" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Yapı" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Kaldır" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Boşalt" @@ -671,25 +588,25 @@ msgstr "Boşalt" msgid "Table %s has been emptied" msgstr "%s tablosu boşaltıldı" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "%s görünümü kaldırıldı" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "%s tablosu kaldırıldı" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "İzleme aktif." -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "İzleme aktif değil." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -698,92 +615,86 @@ msgstr "" "Bu görünüm en az bu satır sayısı kadar olur. Lütfen %sdocumentation%s " "belgesinden yararlanın." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Görünüm" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Kopya etme" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Toplam" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s bu MySQL sunucusundaki varsayılan depolama motorudur." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Seçilileri:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Tümünü Seç" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Hiçbirini Seçme" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Ek yükü olan tabloları kontrol et" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Baskı görünümü" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Tabloyu kontrol et" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Tabloyu uyarla" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Tabloyu onar" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Tabloyu incele" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Dışarı Aktar" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Veri sözlüğü" @@ -794,10 +705,10 @@ msgstr "İzlenen tablolar" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -817,8 +728,8 @@ msgstr "Güncellendi" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Eylem" @@ -852,8 +763,8 @@ msgstr "Yapı görüntüsü yakalama" msgid "Untracked tables" msgstr "İzlenmeyen tablolar" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "Tabloyu izle" @@ -936,7 +847,7 @@ msgstr "İşaretleme silindi." msgid "Showing bookmark" msgstr "İşaret gösteriliyor" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "İşaretleme %s oluşturuldu" @@ -1023,263 +934,115 @@ msgstr "Anamakine adı boş!" msgid "The user name is empty!" msgstr "Kullanıcı adı boş!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Parola boş!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Parolalar birbiriyle aynı değil!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Yeni Kullanıcı ekle" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create version" -msgid "Create User" -msgstr "Sürüm oluştur" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reloading the privileges" -msgid "Reloading Privileges" -msgstr "Yetkiler yeniden yükleniyor" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Seçili kullanıcıları kaldır" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "Kapat" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "İptal" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Yükle" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "İşlemler" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "TAMAM" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Veritabanını şuna yeniden adlandır" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Veritabanı" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Veritabanını şuraya kopyala:" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Karakter grubu" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one column." -msgid "Table must have atleast 1 column" -msgstr "Tablonun en az bir sütunu olmalı." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Tablo oluştur" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Ara" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Değişiklikler kaydedildi" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Bağlantı silindi" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "FOREIGN KEY bağlantısı eklendi" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Dahili bağlantı eklendi" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Hata: Bağlantı eklenmedi." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Hata: bağlantı zaten var." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Tasarımcı düzenlemelerini kaydetme hatası." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Genel bağlantı özellikleri" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Etkisiz" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Kaynak gösterilen anahtarı seç" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Dış Anahtarı seç" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Lütfen birincil anaktarı veya benzersiz anahtarı seçin" -<<<<<<< HEAD -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 -======= #: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 ->>>>>>> origin/master msgid "Choose column to display" msgstr "Göstermek için sütun seçin" #. l10n: Display text for calendar close link -<<<<<<< HEAD -#: js/messages.php:102 -======= #: js/messages.php:73 ->>>>>>> origin/master msgid "Done" msgstr "Bitti" #. l10n: Display text for previous month link in calendar -<<<<<<< HEAD -#: js/messages.php:104 -======= #: js/messages.php:75 ->>>>>>> origin/master msgid "Prev" msgstr "Önceki" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Sonraki" #. l10n: Display text for current month link in calendar -<<<<<<< HEAD -#: js/messages.php:108 -msgid "Today" -msgstr "Bugün" - -#: js/messages.php:111 -======= #: js/messages.php:79 msgid "Today" msgstr "Bugün" #: js/messages.php:82 ->>>>>>> origin/master msgid "January" msgstr "Ocak" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "Şubat" -<<<<<<< HEAD -#: js/messages.php:113 -msgid "March" -msgstr "Mart" - -#: js/messages.php:114 -======= #: js/messages.php:84 msgid "March" msgstr "Mart" #: js/messages.php:85 ->>>>>>> origin/master msgid "April" msgstr "Nisan" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Mayıs" -<<<<<<< HEAD -#: js/messages.php:116 -msgid "June" -msgstr "Haziran" - -#: js/messages.php:117 -msgid "July" -msgstr "Temmuz" - -#: js/messages.php:118 -======= #: js/messages.php:87 msgid "June" msgstr "Haziran" @@ -1289,106 +1052,86 @@ msgid "July" msgstr "Temmuz" #: js/messages.php:89 ->>>>>>> origin/master msgid "August" msgstr "Ağustos" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "Eylül" -<<<<<<< HEAD -#: js/messages.php:120 -======= #: js/messages.php:91 ->>>>>>> origin/master msgid "October" msgstr "Ekim" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "Kasım" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "Aralık" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Oca" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Şub" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Nis" #. l10n: Short month name -<<<<<<< HEAD -#: js/messages.php:134 libraries/common.lib.php:1574 -======= #: js/messages.php:105 libraries/common.lib.php:1565 ->>>>>>> origin/master msgctxt "Short month name" msgid "May" msgstr "May" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Haz" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Tem" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Ağu" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Eyl" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Eki" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Kas" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Ara" -<<<<<<< HEAD -#: js/messages.php:151 -msgid "Sunday" -msgstr "Pazar" - -#: js/messages.php:152 -msgid "Monday" -msgstr "Pazartesi" - -#: js/messages.php:153 -======= #: js/messages.php:122 msgid "Sunday" msgstr "Pazar" @@ -1398,154 +1141,109 @@ msgid "Monday" msgstr "Pazartesi" #: js/messages.php:124 ->>>>>>> origin/master msgid "Tuesday" msgstr "Salı" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "Çarşamba" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "Perşembe" -<<<<<<< HEAD -#: js/messages.php:156 -======= #: js/messages.php:127 ->>>>>>> origin/master msgid "Friday" msgstr "Cuma" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "Cumartesi" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Paz" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Ptesi" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Salı" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Çar" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Per" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Cu" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Ctesi" #. l10n: Minimal week day name -<<<<<<< HEAD -#: js/messages.php:177 -======= #: js/messages.php:148 ->>>>>>> origin/master msgid "Su" msgstr "Paz" #. l10n: Minimal week day name -<<<<<<< HEAD -#: js/messages.php:179 -======= #: js/messages.php:150 ->>>>>>> origin/master msgid "Mo" msgstr "Ptesi" #. l10n: Minimal week day name -<<<<<<< HEAD -#: js/messages.php:181 -======= #: js/messages.php:152 ->>>>>>> origin/master msgid "Tu" msgstr "Sa" #. l10n: Minimal week day name -<<<<<<< HEAD -#: js/messages.php:183 -======= #: js/messages.php:154 ->>>>>>> origin/master msgid "We" msgstr "Ça" #. l10n: Minimal week day name -<<<<<<< HEAD -#: js/messages.php:185 -======= #: js/messages.php:156 ->>>>>>> origin/master msgid "Th" msgstr "Pe" #. l10n: Minimal week day name -<<<<<<< HEAD -#: js/messages.php:187 -======= #: js/messages.php:158 ->>>>>>> origin/master msgid "Fr" msgstr "Cu" #. l10n: Minimal week day name -<<<<<<< HEAD -#: js/messages.php:189 -======= #: js/messages.php:160 ->>>>>>> origin/master msgid "Sa" msgstr "Ctesi" #. l10n: Column header for week of the year in calendar -<<<<<<< HEAD -#: js/messages.php:191 -======= #: js/messages.php:162 ->>>>>>> origin/master msgid "Wk" msgstr "Hs" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "Saat" -<<<<<<< HEAD -#: js/messages.php:194 -msgid "Minute" -msgstr "Dakika" - -#: js/messages.php:195 -======= #: js/messages.php:165 msgid "Minute" msgstr "Dakika" #: js/messages.php:166 ->>>>>>> origin/master msgid "Second" msgstr "Saniye" @@ -1605,7 +1303,7 @@ msgstr "İndeksler" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Eşsiz" @@ -1623,7 +1321,7 @@ msgid "Comment" msgstr "Yorum" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1648,8 +1346,8 @@ msgstr "" "İndeks %1$s ve %2$s eşit görünüyor ve bunlardan birinin silinmesi mümkün " "olabilir." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Veritabanları" @@ -1816,11 +1514,7 @@ msgstr "Parola:" msgid "Server Choice" msgstr "Sunucu Seçimi" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Bu kısmı geçmek için tanımlama bilgileri (cookies) açık olmalı." @@ -1902,11 +1596,7 @@ msgstr "" "Gerekli uzantılar yüklenmiş görünmesine rağmen, ne iconv, ne libinconv, ne " "de recode_string işlevi kullanılamadı. PHP yapılandırmanızı kontrol edin." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Eğer boş bir sayfa " "karşınıza çıkıyorsa, her şey yolunda demektir." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "Varsayılan yapılandırma bundan yüklenemedi: %1$s" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1943,49 +1625,29 @@ msgstr "" "$cfg['PmaAbsoluteUri'] talimatı yapılandırma dosyanız içinde " "AYARLANMAK zorundadır!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "Geçersiz sunucu indeksi: %s" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" "%1$s sunucusu için geçersiz anamakine. Lütfen yapılandırmanızı gözden " "geçirin." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Sunucu" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "Yapılandırma içinde geçersiz kimlik denetimi yöntemi ayarı:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "Yapılandırma içinde geçersiz kimlik denetimi yöntemi ayarı:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "%s %s veya sonrasına yükseltmelisiniz." @@ -2011,7 +1673,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Belgeler" @@ -2025,140 +1687,136 @@ msgstr "SQL sorgusu" msgid "MySQL said: " msgstr "MySQL çıktısı: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "SQL'i açıkla" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "SQL Açıklamasını atla" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "PHP Kodsuz" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "PHP Kodu oluştur" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Yenile" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "SQL Onaylamayı atla" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "SQL'i onayla" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "Bu sorguyu sıralı düzenle" -<<<<<<< HEAD -#: libraries/common.lib.php:1283 -======= #: libraries/common.lib.php:1280 ->>>>>>> origin/master msgid "Inline" msgstr "Sıralı" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Profil çıkart" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Süre" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "B" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PiB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EiB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d %B %Y, %H:%M:%S" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s gün, %s saat, %s dakika ve %s saniye" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Yukarı" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Önceki" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Son" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr ""%s" veritabanına git." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "%s işlevselliği bilinen bir hata tarafından zarar görmüş, bakınız %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2179,7 +1837,7 @@ msgid "Events" msgstr "Olaylar" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "İsim" @@ -2207,15 +1865,15 @@ msgstr "Sorgu" msgid "Designer" msgstr "Tasarımcı" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "İçeri Aktar" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Yetkiler" @@ -2236,11 +1894,7 @@ msgstr "" "a]'e bakın" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Ek Yük" @@ -2259,7 +1913,7 @@ msgstr "Sunucu yanıt vermiyor" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(ya da yerel MySQL sunucusunun soketi doğru olarak yapılandırılmadı)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Ayrıntılar..." @@ -2269,36 +1923,22 @@ msgid "Change password" msgstr "Parola değiştir" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Parola yok" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Parola" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Yeniden gir" @@ -2311,20 +1951,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 uyumlu" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Parola Üret" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Üret" @@ -2337,29 +1969,21 @@ msgstr "Yeni veritabanı oluştur" msgid "Create" msgstr "Oluştur" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Yetkiniz yok" -<<<<<<< HEAD -#: libraries/display_create_table.lib.php:47 -======= #: libraries/display_create_table.lib.php:41 msgid "Table must have at least one column." msgstr "Tablonun en az bir sütunu olmalı." #: libraries/display_create_table.lib.php:48 ->>>>>>> origin/master #, php-format msgid "Create table on database %s" msgstr "%s veritabanında yeni tablo oluştur" -<<<<<<< HEAD -#: libraries/display_create_table.lib.php:56 -======= #: libraries/display_create_table.lib.php:57 ->>>>>>> origin/master msgid "Number of columns" msgstr "Sütun sayısı" @@ -2422,11 +2046,7 @@ msgid "remember template" msgstr "şablonu hatırla" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Dosyanın karakter grubu:" @@ -2437,7 +2057,7 @@ msgstr "Sıkıştırma" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Hiçbiri" @@ -2484,11 +2104,7 @@ msgstr "" msgid "File to import" msgstr "İçeri aktarmak için dosya" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Metin dosyasının yeri" @@ -2496,20 +2112,12 @@ msgstr "Metin dosyasının yeri" msgid "File uploads are not allowed on this server." msgstr "Bu sunucuda dosya gönderimlerine izin verilmez." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Gönderme işi için ayarladığınız dizine ulaşılamıyor" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "web sunucusu gönderme dizini" @@ -2643,11 +2251,7 @@ msgstr "Anahtara göre sırala" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Seçenekler" @@ -2715,14 +2319,14 @@ msgstr "Satırlar gösteriliyor" msgid "total" msgstr "toplam" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Sorgu %01.4f san. sürdü" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Değiştir" @@ -2792,11 +2396,7 @@ msgstr "Ara Bellek Havuzu Kullanımı" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Toplam" @@ -3084,11 +2684,7 @@ msgstr "" "diğer taraftan yeniden adlandırılır ve bir sonraki en yüksek numara verilir." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Biçim" @@ -3152,13 +2748,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Veri" @@ -3207,15 +2798,9 @@ msgstr "MIME türü" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Anamakine" @@ -3408,7 +2993,7 @@ msgstr "İçerikleri dışarı aktar" msgid "Open new phpMyAdmin window" msgstr "Yeni phpMyAdmin penceresi aç" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "Yeni tablo" @@ -3420,7 +3005,7 @@ msgstr "SQL sonucu" msgid "Generated by" msgstr "Üreten:" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL boş bir sonuç kümesi döndürdü (örn. sıfır satır)." @@ -3567,20 +3152,20 @@ msgstr "Kana'ya dönüştür" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Birincil" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "İndeks" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Tam metin" @@ -3805,6 +3390,10 @@ msgstr "Bu biçimin seçenekleri yok" msgid "not OK" msgstr "TAMAM değil" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "TAMAM" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Etkin" @@ -3828,7 +3417,7 @@ msgstr "" "Sütun_Yorumları tablonuzun nasıl güncelleneceğini öğrenmek için lütfen " "belgelere bakın" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "SQL sorgusu işaretlendi" @@ -3885,13 +3474,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Kullanıcı Adı" @@ -3908,22 +3492,14 @@ msgstr "Master durumu" msgid "Slave status" msgstr "Slave durumu" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Değişken" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Değer" @@ -3943,40 +3519,11 @@ msgstr "" msgid "Add slave replication user" msgstr "Slave kopya etme kullanıcısı ekle" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Herhangi kullanıcı" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Metin alanını kullan" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Herhangi anamakine" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Yerel" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Bu Anamakine" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Anamakine Tablosu kullan" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -4000,7 +3547,6 @@ msgid "Use Host Table" msgstr "Anamakine Tablosu kullan" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -4036,29 +3582,29 @@ msgstr "Bilinmeyen dil: %1$s." msgid "Servers" msgstr "Sunucular" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Değişkenler" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Karakter grupları" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Motorlar" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Binari günlüğü" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "İşlemler" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Eşitle" @@ -4085,53 +3631,49 @@ msgstr "Farkı" msgid "Target database" msgstr "Hedef veritabanı" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "%s sunucusu üzerinde SQL sorgusunu/sorgularını çalıştır" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "%s veritabanı üzerinde SQL sorgusunu/sorgularını çalıştır" -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:320 -======= #: libraries/sql_query_form.lib.php:317 ->>>>>>> origin/master msgid "Columns" msgstr "Sütun" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Bu SQL sorgusunu işaretle" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Bütün kullanıcıların bu işaretlemeye erişimlerine izin ver" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Mevcut aynı ismin işaretlemesini değiştir" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Pencere dışından bu sorgunun üzerine yazma" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Sınırlayıcı" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Bu sorguyu burada tekrar göster " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Gönder" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Sadece göster" @@ -4301,16 +3843,12 @@ msgstr "PARTITION tanımı" msgid "Save" msgstr "Kaydet" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, php-format msgid "Add %s column(s)" msgstr "%s sütun ekle" -<<<<<<< HEAD -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 -======= #: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 ->>>>>>> origin/master msgid "You have to add at least one column." msgstr "En az bir sütun eklemek zorundasınız." @@ -4484,8 +4022,8 @@ msgstr "Sıfırla" msgid "Protocol version" msgstr "Protokol sürümü" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Kullanıcı" @@ -4929,116 +4467,116 @@ msgstr "Depolama Motorları" msgid "View dump (schema) of databases" msgstr "Veritabanlarının dökümünü (şemasını) göster" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "GRANT hariç tüm yetkileri içerir." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Varolan tabloların yapısının değiştirilmesine izin verir." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Depolanan yordamların değiştirilmesine ve kaldırılmasına izin verir." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Yeni veritabanları ve tabloların oluşturulmasına izin verir." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Depolanan yordamların oluşturulmasına izin verir." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Yeni tabloların oluşturulmasına izin verir." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Geçici tablolara oluşturulmasına izin verir." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" "Kullanıcı hesaplarının oluşturulmasına, kaldırılmasına ve yeniden " "adlandırılmasına izin verir." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Yeni görünümlerin oluşturulmasına izin verir." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Veri silinmesine izin verir." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Veritabanları ve tabloların kaldırılmasına izin verir." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Tabloların kaldırılmasına izin verir." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Olay zamanlayıcısı için olayları ayarlamaya izin verir" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Depolanan yordamların yürütülmesine izin verir." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Verinin içeri ve dışarı aktarılmasına izin verir." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Yetki tablolarını yeniden yüklemeden yeni kullanıcıların ve yetkilerin " "eklenmesine izin verir." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "İndekslerin oluşturulmasına ve kaldırılmasına izin verir." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Verinin eklenmesine ve yerinin değiştirilmesine izin verir." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Şu anki işlem için tabloların kilitlenmesine izin verir." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Kullanıcının saat başına açabileceği yeni bağlantı sayısını sınırlar." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Kullanıcının saat başına sunucuya gönderebileceği sorgu sayısını sınırlar." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5046,61 +4584,61 @@ msgstr "" "Kullanıcının saat başına çalıştırabileceği herhangi bir tabloyu veya " "veritabanını değiştiren komut sayısını sınırlar." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "Kullanıcının eşzamanlı bağlantı sayısını sınırlar." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Tüm kullanıcıların işlemlerini görüntülemeye izin verir" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Bu MySQL sürümünde etkisi yoktur." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Sunucu ayarlarının yeniden yüklenmesine ve sunucunun önbelleğinin " "temizlenmesine izin verir." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" "Kullanıcılara slave / master'ların nerede olduğunu sormasına izin verir." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Kopya edilen slave'ler için gereklidir." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Veri okunmasına izin verir." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Bütün veritabanı listesine erişim verir." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "SHOW CREATE VIEW sorgularının yapılmasına izin verir." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Sunucunun kapatılmasına izin ver." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5110,160 +4648,152 @@ msgstr "" "değişkenleri ayarlamak veya diğer kullanıcıların işlemlerini sonlandırmak " "gibi pek çok yönetimsel işlemler için gereklidir." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "Tetikleyicileri oluşturmaya ve kaldırmaya izin verir" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Veri değiştirilmesine izin ver." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Yetkiniz yok." -<<<<<<< HEAD -#: server_privileges.php:303 server_privileges.php:304 -======= #: server_privileges.php:302 server_privileges.php:303 ->>>>>>> origin/master msgctxt "None privileges" msgid "None" msgstr "Hiçbiri" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Tabloya özgü yetkiler" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Not: MySQL yetki adları İngilizce olarak belirtilir " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Genel yetkiler" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Veritabanına özgü yetkiler" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Yönetim" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Kaynak sınırları" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Not: Bu seçeneklerin 0 (sıfır)'a ayarlanması sınırı kaldırır." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Oturum Açma Bilgisi" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Parolayı değiştirme" -<<<<<<< HEAD -#: server_privileges.php:844 server_privileges.php:2228 -======= #: server_privileges.php:843 server_privileges.php:2205 ->>>>>>> origin/master msgid "No user found." msgstr "Kullanıcı bulunamadı." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "%s kullanıcısı zaten var!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Yeni bir kullanıcı eklediniz." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "%s için yetkileri güncellediniz." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "%s için yetkileri geri aldınız" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "%s için parola başarılı olarak değiştirildi." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "%s siliniyor" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Silmek için kullanıcı seçilmedi!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Yetkiler yeniden yükleniyor" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Seçili kullanıcılar başarılı olarak silindi." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Yetkiler başarılı olarak yüklendi." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Yetkileri düzenle" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Geri al" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Kullanıcı gözden geçirme" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Onayla" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Herhangi" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Yeni Kullanıcı ekle" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Seçili kullanıcıları kaldır" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Kullanıcılardan tüm aktif yetkileri geri al ve sonra da sil." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Kullanıcılarla aynı isimlerde olan veritabanlarını kaldır." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5276,48 +4806,48 @@ msgstr "" "sunucunun kullandığı yetkilerden farklı olabilir. Bu durumda devam etmeden " "önce %syetkileri yeniden yüklemeniz%s gerekir." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Seçili kullanıcı yetki tablosunda bulunamadı." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Sütuna özgü yetkiler" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Aşağıdaki veritabanına yetkileri ekle" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "_ ve % jokerleri harfi harfine kullanılmak için \\ ile doldurun" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Aşağıdaki tabloya yetkileri ekle" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Otutum Açma Bilgisini değiştir / Kullanıcıyı kopyala" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Aynı yetkilerle yeni bir kullanıcı oluştur ve ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... eski olanı sakla." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... eski olanı kullanıcı tablolarından sil." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... eski olandan bütün aktif yetkileri iptal et ve sonra da sil." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5325,46 +4855,42 @@ msgstr "" " ... eski olanı kullanıcı tablolarından sil ve sonra da yetkileri yeniden " "yükle." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Kullanıcı için veritabanı" -<<<<<<< HEAD -#: server_privileges.php:2060 -======= #: server_privileges.php:2037 ->>>>>>> origin/master msgctxt "Create none database for user" msgid "None" msgstr "Hiçbiri" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "Aynı isimle veritabanı oluştur ve tüm yetkileri ver" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "Joker isimlere tüm yetkileri ver (kullanıcıadı\\_%)" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr ""%s" veritabanı üzerindeki tüm yetkileri ver" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr ""%s" veritabanına erişimi olan kullanıcılar" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "genel" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "Veritabanına özgü" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "joker" @@ -8286,25 +7812,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "Eklenen satır id: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "PHP kodu olarak gösteriliyor" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "SQL sorgusu gösteriliyor" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "`%s` tablosunun indeksleri ile ilgili sorunlar" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Etiket" @@ -8354,13 +7880,6 @@ msgstr "Yeni satır olarak ekle ve hataları yoksay" msgid "Show insert query" msgstr "Ekleme sorgusunu göster" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "ve sonra" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Önceki sayfaya geri dön" @@ -8443,7 +7962,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "İndekse %s sütun ekle" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Sütun sayısı sıfırdan büyük olmalı." @@ -8555,41 +8074,6 @@ msgstr "İlgili bütünlük kontrolü:" msgid "Show tables" msgstr "Tabloları göster" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Alan kullanımı" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Kullanım" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Etkili" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Satır İstatistikleri" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "İfadeler" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "sabit" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "değişken" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Satır uzunluğu" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Alan kullanımı" @@ -8623,7 +8107,6 @@ msgid "Row length" msgstr "Satır uzunluğu" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Satır boyutu " @@ -8691,51 +8174,47 @@ msgstr "Hiçbiri" msgid "Column %s has been dropped" msgstr "Sütun %s kaldırıldı" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "%s üzerinde birincil anahtar eklendi" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "%s üzerinde bir indeks eklendi" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "İlişki görünümü" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Tablo yapısı öner" -<<<<<<< HEAD -#: tbl_structure.php:538 -======= #: tbl_structure.php:540 ->>>>>>> origin/master msgid "Add column" msgstr "Sütun ekle" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Tablonun Sonuna" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Tablonun Başına" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "%s tablosundan sonra" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, php-format msgid "Create an index on  %s columns" msgstr " %s sütunda indeks oluştur" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "bölüme ayrıldı" @@ -8781,6 +8260,10 @@ msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" "SQL ifadeleri dışarı aktarıldı. Lütfen yığını kopyalayın ya da çalıştırın." +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "Kapat" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/tt.po b/po/tt.po old mode 100755 new mode 100644 index 4f171412d..d3999798d --- a/po/tt.po +++ b/po/tt.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-30 23:14+0200\n" "Last-Translator: Michal \n" "Language-Team: tatarish \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Barısın kürsät" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -42,53 +38,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Ezläw" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Äydä" @@ -114,7 +94,7 @@ msgstr "Bu bäyä belän" msgid "Database %1$s has been created." msgstr "%s biremlege beterelde." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Biremlek açıqlaması:" @@ -141,17 +121,10 @@ msgstr "Alan iseme" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Töre" @@ -164,7 +137,7 @@ msgstr "Töre" msgid "Null" msgstr "Buş" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -188,24 +161,18 @@ msgstr "Bonı belän bäyläneş:" msgid "Comments" msgstr "Açıqlama" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Yuq" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -214,15 +181,9 @@ msgstr "Yuq" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -241,142 +202,134 @@ msgstr "Biremlek eçtälegen (tözeleşen) çığaru" msgid "No tables found in database." msgstr "Bu biremlektä ber genä dä tüşämä yuq." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Saylap Beter" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Saylanunı Töşer" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Biremlek iseme buş!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "\"%s\" biremlege \"%s\" itep ataldı" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Database %s has been copied to %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Biremlekne bolay atap quy" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Ämer" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr ", şunnan soñ" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Biremlekne boña kübäyt" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Tözeleşen genä" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Tözeleşen dä, eçtälegen dä" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Eçtälegen genä" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "Kübäytü aldınnan CREATE DATABASE östise" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "%s östäw" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "\"AUTO_INCREMENT\" bäyäsen östise" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Çikläwlär östise" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Kübäytelgän biremlekkä küçäse" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Torış" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Açıq" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "Sünek" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "Tüşämä tözätü" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Sünek" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "Açıq" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Tezü cayı" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -385,14 +338,14 @@ msgstr "" "Bäyläneştä torğan tüşämä belän eşläp bulmas, östämä eşli-alu sünek tora. Anı " "qabızu öçen, %sbonda çirtäse%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "PDF-Bitlär Üzgärtü" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -401,11 +354,7 @@ msgstr "Tüşämä" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Kerem" @@ -413,42 +362,30 @@ msgstr "Kerem" msgid "Size" msgstr "Küläme" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "totıla" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Yasalışı" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Soñğı yañartılu" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Soñğı tikşerü" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -508,11 +445,7 @@ msgstr "Sal" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Yä" @@ -546,85 +479,85 @@ msgstr "Tüşämä qullanıp" msgid "SQL query on database %s:" msgstr "%s biremlegenä SQL-soraw:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Sorawnı Yulla" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "İreşep Bulmadı" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "berärse bulsa" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "barısı da bulsa" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "tulı tezmä, tögäl kileş" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "regexp kileş" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "\"%s\" ezläw näticäse %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s kileşü bar, %s atlı tüşämädä" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Küzätü" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Sal" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Tulayım: %s kileşü" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Biremlektä ezläw: " -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Tabası süz/bäyä tezmäse (almaşbilgese: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Ezläw:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Süzlärne buşlıq bilgese belän ayırası (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Kiläse tüşämä eçendä:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -632,36 +565,36 @@ msgstr "Kiläse tüşämä eçendä:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Östäw" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Tözeleş" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Beter" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Buşat" @@ -671,118 +604,112 @@ msgstr "Buşat" msgid "Table %s has been emptied" msgstr "\"%s\" atlı tüşämä buşatıldı" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "\"%s\" atlı Qaraş beterelgän buldı" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "\"%s\" atlı tüşämä beterelde" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Qaraş" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 #, fuzzy msgid "Replication" msgstr "Bäyläneşlär" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Sum" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "Bu MySQL-serverdä %s digän saqlaw ısulı töp bularaq saylanğan." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Saylanğannı:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Saylap Beter" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Saylanunı Töşer" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Check overheaded" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Bastıru küreneşe" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Tüşämä tikşerü" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Optimize table" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Tüşämä tözätü" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Tüşämä centekläw" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Export" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Eçtälek Süzlege" @@ -794,10 +721,10 @@ msgstr "Tüşämä tikşerü" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -819,8 +746,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Eş" @@ -857,8 +784,8 @@ msgstr "Tözeleşen genä" msgid "Untracked tables" msgstr "Tüşämä tikşerü" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "Tüşämä tikşerü" @@ -935,7 +862,7 @@ msgstr "Tamğa beterelde." msgid "Showing bookmark" msgstr "Bitbilge kürsätü" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "%s digän bitbilge yaratıldı" @@ -1014,294 +941,188 @@ msgstr "Host adı buş!" msgid "The user name is empty!" msgstr "Atama buş!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Sersüzeñ buş!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Sersüzlär berbersenä kileşmi!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Yaña qullanuçı östäw" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "Server söreme" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Xoquqlarnı qabat yökläw" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Saylanğan qullanuçı beterü" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "Cirle" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Proseslar" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Biremlekne bolay atap quy" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Biremlek" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Biremlekne boña kübäyt" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Bilgelämä" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Töşämä alannarı sanı kimendä 1 bulırğa teş." - -#: js/messages.php:70 -#, fuzzy -msgid "Create Table" -msgstr "Yaña Bit yaratu" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Ezläw" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Üzgärtülär saqlandı" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 #, fuzzy msgid "Relation deleted" msgstr "Bäyläneşkä küzätü" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 #, fuzzy msgid "Internal relation added" msgstr "Eçke bäyläneş" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Bäyläneşlär buyınça töp mömkinleklär" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Sünek" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Kürsätäse Alan saylaw" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy msgid "Done" msgstr "Eçtälek" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Uzğan" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Kiläse" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Tulayım" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Binar" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Mar" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Äpr" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "May" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Yün" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Yül" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Aug" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Ökt" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Ğın" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Feb" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Äpr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1309,176 +1130,176 @@ msgid "May" msgstr "May" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Yün" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Yül" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Aug" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Sen" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Ökt" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Nöy" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Dek" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Ykş" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Dşm" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Sşm" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Cmğ" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Ykş" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Dşm" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Sşm" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Çrş" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Pnc" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Cmğ" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Şmb" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Ykş" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Dşm" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Sşm" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Çrş" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Pnc" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Cmğ" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Şmb" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "totıla" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1536,7 +1357,7 @@ msgstr "Tezeşlär" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Qabatsız" @@ -1555,7 +1376,7 @@ msgid "Comment" msgstr "Açıqlama" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1578,8 +1399,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Biremleklär" @@ -1747,11 +1568,7 @@ msgstr "Sersüz:" msgid "Server Choice" msgstr "Server Saylaw" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Cookies must be enabled past this point." @@ -1831,11 +1648,7 @@ msgstr "" "Can not use iconv nor libiconv nor recode_string function while extension " "reports to be loaded. Check your php configuration." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
If you receive a blank page, everything " "is fine." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "Töp köyläneşen yökläp bulmadı: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1873,48 +1678,28 @@ msgstr "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Serverdäge \"%s\" digän tezeleş yaraqsız" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Server" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "You should upgrade to %s %s or later." @@ -1940,7 +1725,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Qullanma" @@ -1954,138 +1739,138 @@ msgstr "SQL-soraw" msgid "MySQL said: " msgstr "MySQL qaytarışı:" -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "SQL Centekläw" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "SQL Centeklämäskä" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "PHP Kodısız" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "PHP-Kod yasa" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Yañart" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "SQL Tikşermäskä" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "SQL'nı Tikşer" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Engine" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Waqıt" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Bayt" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%Y.%m.%d, %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s kön, %s säğät, %s minut ta %s sekund" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Başlawğa" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Uzğan" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Azaq" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr ""%s" biremlegenä küç." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2105,7 +1890,7 @@ msgid "Events" msgstr "Cibärelde" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Adı" @@ -2133,15 +1918,15 @@ msgstr "Soraw" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Yökläw" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Xoquqlar" @@ -2160,11 +1945,7 @@ msgid "" msgstr "Törle buluı bar. YBS 3.11 qarísı" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Overhead" @@ -2181,7 +1962,7 @@ msgstr "Bu server endäşmi" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(yä cirle MySQL-server soketı döres köylänmägän ide)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2191,36 +1972,22 @@ msgid "Change password" msgstr "Sersüz üzgärtü" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Sersüzsez" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Sersüz" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Qabatla" @@ -2235,20 +2002,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 öçen yaraqlı" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Sersüz Ürçetü" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Ürçet" @@ -2261,17 +2020,23 @@ msgstr "Yaña biremlek yaratu" msgid "Create" msgstr "Yarat" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Xoquqsız" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Töşämä alannarı sanı kimendä 1 bulırğa teş." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "%s biremlegendä yaña tüşämä yaratu" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2334,11 +2099,7 @@ msgid "remember template" msgstr "tözeleşen yatla" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Şul biremneñ bilgelämäse:" @@ -2349,7 +2110,7 @@ msgstr "Qısu" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Buş" @@ -2391,11 +2152,7 @@ msgstr "" msgid "File to import" msgstr "Yöklise birem" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "SQL-ämerlege belän birem yökläw" @@ -2403,20 +2160,12 @@ msgstr "SQL-ämerlege belän birem yökläw" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Yökläw öçen bigelängän törgäkne uqıp bulmí" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "web-server'neñ yökläw törgäge" @@ -2547,11 +2296,7 @@ msgstr "Qullanası tezeş" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "Eşkärtü" @@ -2623,14 +2368,14 @@ msgstr "Yazma sanı:" msgid "total" msgstr "tulayım" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Soraw eşkärtü %01.4f sek aldı" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Üzgärt" @@ -2698,11 +2443,7 @@ msgstr "Bufer Pul Totılğanlığı" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Tulayım" @@ -2962,11 +2703,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Tözeleş" @@ -3038,13 +2775,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Eçtälek" @@ -3093,15 +2825,9 @@ msgstr "MIME-törläre" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Host" @@ -3304,7 +3030,7 @@ msgstr "Çığaru ısulı" msgid "Open new phpMyAdmin window" msgstr "Yaña phpMyAdmin-täräzä açu" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "Berär genä dä tüşämä yuq" @@ -3317,7 +3043,7 @@ msgstr "SQL qaytarışı" msgid "Generated by" msgstr "Ürçätkeç:" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL sorawğa buş cawap, yäğni nül kertem qaytarttı." @@ -3467,20 +3193,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Töp" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Tezeş" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Tulımäten" @@ -3705,6 +3431,10 @@ msgstr "Bu tözeleşeneñ köyläneşe yuq" msgid "not OK" msgstr "OK tügel" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Açıq" @@ -3726,7 +3456,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "Sineñ Column_comments Tüşämä yañartu eşe turında Qullanmada qarísı" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Tamğalanğan SQL-soraw" @@ -3777,13 +3507,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "İreşü iseme" @@ -3801,22 +3526,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Üzgärmä" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Bäyä" @@ -3834,40 +3551,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Törle qullanuçı" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Bu mätennän" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Bar bulğan host" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Cirle" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Bu Sanaq" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Host Tüşämä eçennän" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3891,7 +3579,6 @@ msgid "Use Host Table" msgstr "Host Tüşämä eçennän" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3925,29 +3612,29 @@ msgstr "Belgesez tel: %1$s." msgid "Servers" msgstr "Serverlär" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Üzgärmälär" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Bilgelämä" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Engine" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Binar köndälek" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Proseslar" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3976,51 +3663,51 @@ msgstr "" msgid "Target database" msgstr "Biremlektä ezläw: " -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "%s digän serverdä SQL-soraw eşlätü" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "%s biremlegendä eşlätäse SQL-soraw" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Alan iseme" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Bu SQL-sorawğa tamğa quy" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Bu tamğanı bar qullanuçığa da ireşüle itäse" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Şulay uq atalğan bitbilgelärne almaştırası" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Bu sorawnı, täräzä tışında bulğanı belän almaştırası tügel" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Bu sorawnı qabat kürsätäse" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Künder" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Kürep kenä" @@ -4196,13 +3883,13 @@ msgstr "" msgid "Save" msgstr "Saqla" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "%s alan östäw" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4396,8 +4083,8 @@ msgstr "Awdar" msgid "Protocol version" msgstr "Protokol söreme" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Qullanuçı" @@ -4839,112 +4526,112 @@ msgstr "Saqlaw Isulı" msgid "View dump (schema) of databases" msgstr "Biremleklärneñ eçtälegen (tözeleşen) çığaru" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "GRANT'tan basqa bar xoquqlar da bar." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Biredä bulğan tüşämä tözeleşen üzgärtü xoquqı." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Allows altering and dropping stored routines." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Yaña biremlek/tüşämä yasaw xoquqı." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Saqlanğan funksílar qorırğa birä." -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Yaña tüşämä yasaw xoquqı." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Waqıtlı tüşämä yasaw xoquqı." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Qullanuçı xísabın qoru/salu/ataw eşen qılırğa birä." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Yaña qaraş qorırğa birä." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Eçtälek beterü xoquqı." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Biremlek/tüşämä beterü xoquqı." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Tüşämä beterü xoquqı." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Eçke funksílar eşlätterergä birä." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Allows importing data from and exporting data into files." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Allows adding users and privileges without reloading the privilege tüşämä." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Açqıçlarnı qoru/beterü xoquqı." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Eçtälek östäw/almaştıru xoquqı." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Allows locking tables for the current thread." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "Limits the number of new connections the user may open per hour." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Limits the number of queries the user may send to the server per hour." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4952,59 +4639,59 @@ msgstr "" "Limits the number of commands that change any table or database the user may " "execute per hour." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 #, fuzzy msgid "Limits the number of simultaneous connections the user may have." msgstr "Limits the number of new connections the user may open per hour." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Has no effect in this MySQL version." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "Allows reloading server settings and flushing the server's caches." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Gives the right to the user to ask where the slaves / masters are." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Needed for the replication slaves." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Eçtälekne uqu xoquqı." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Gives access to the complete list of databases." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "SHOW CREATE VIEW sorawların eşläterlek itä." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Serverne tuqtatu xoquqı." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5014,157 +4701,157 @@ msgstr "" "Required for most administrative operations like setting global variables or " "killing threads of other users." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "Açqıçlarnı qoru/beterü xoquqı." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Eçtälek üzgärtü xoquqı." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Xoquqlar yuq." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Buş" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Berär tüşämä öçen xoquqlar" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Beläse: MySQL'da xoquq adı İnglizçä kertelä!" -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Töp xoquq" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Berär biremlekkä qağılışlı xoquqlar" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "İdärä" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Resurs çikläwläre" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Beläse: 0 (nül) kertelgän çaqta çikläwe beterelä." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Kereş Turında" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Sersüzen üzgärtäse tügel" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Qullanuçı yuq." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "\"%s\" atlı qullanuçı bar inde!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Yana qullanuçı östälände." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "You have updated the privileges for %s." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "You have revoked the privileges for %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "\"%s\" öçen sezsüz üzgärtü uñışlı uzdı." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "\"%s\" Beterü" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Beteräse qullanuçılar saylanmağan!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Bu xoquqlarnı yöklä" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Saylanğan qullanuçını beterü uñışlı uzdı." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Bu xoquqlarnı yökläw uñışlı uzdı." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Xoquqlar Üzgärtü" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Töşer" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Qullanuçılar tezmäse" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Xoquq" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Törle" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Yaña qullanuçı östäw" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Saylanğan qullanuçı beterü" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Qullanuçı xoquqların awdarıp beteräse." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Bu qullanuçılar kebek atalğan biremleklärne beteräse." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5177,95 +4864,95 @@ msgstr "" "alardan ayırıla ala. Andí çaqlarda, dawam itü aldınnan, %sxoquqlarnı qabat " "yökläp alası%s." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Bu qullanuçı xoquqlar tüşämä eçendä tabılmadı." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Berär bağana öçen xoquqlar" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Kiläse biremlek öçen xoquqlar östäw" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "_ belän % bilgelären şul kileş kenä qullanu öçen \\ belän ütkärergä kiräk" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Kiläse tüşämä öçen xoquqlar östäw" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Change Login Information / Copy User" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Create a new user with the same privileges and ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... keep the old one." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... delete the old one from the user tables." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... revoke all active privileges from the old one and delete it afterwards." +#: server_privileges.php:2011 +msgid "" +" ... delete the old one from the user tables and reload the privileges " +"afterwards." +msgstr "" +" ... delete the old one from the user tables and reload the privileges " +"afterwards." + #: server_privileges.php:2033 -msgid "" -" ... delete the old one from the user tables and reload the privileges " -"afterwards." -msgstr "" -" ... delete the old one from the user tables and reload the privileges " -"afterwards." - -#: server_privileges.php:2056 msgid "Database for user" msgstr "Qullanuçı biremlege" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Buş" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "\"%s\" biremlege öçen xoquqlar tikşerü." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "\"%s\" belän eşläw xoquqı bulğan qullanuçılar" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "ğömümi" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "berär biremlekkä qağılışlı" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "almaşbilge" @@ -7915,26 +7602,26 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 #, fuzzy msgid "Showing SQL query" msgstr "Tulı Sorawlar Kürsät" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "`%s` atlı tüşäw tezeşläre belän nidider tiskärlek bar" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Yarlıq" @@ -7986,13 +7673,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr ", şunnan soñ" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Aldağı bitkä qaytu" @@ -8073,7 +7753,7 @@ msgstr "(Töp açqıçnıñ ğına adı \"PRIMARY\" bulırğa tieş>>>>>> origin/master msgid " Row size " msgstr " Kerem olılığı" @@ -8331,50 +7975,50 @@ msgstr "Buş" msgid "Column %s has been dropped" msgstr "\"%s\" atlı tüşämä beterelde" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "\"%s\" öçen töp açqıç qorıldı" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "\"%s\" öçen ber açqıç qorıldı" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Bäyläneşkä küzätü" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Tüşämä tözeleşenä küzätü" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "%s alan östäw" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Tüşämä azağına" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Tüşämä Başına" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "%s artınnan" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "%s alannan tezeş yaratu" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8416,6 +8060,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8791,6 +8439,9 @@ msgstr "Tüşämä adın üzgärtü" #~ msgid "Process list" #~ msgstr "Proses isemlege" +#~ msgid "Reload privileges" +#~ msgstr "Xoquqlarnı qabat yökläw" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/uk.po b/po/uk.po old mode 100755 new mode 100644 index 306cdf342..53245d88a --- a/po/uk.po +++ b/po/uk.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:19+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: ukrainian \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Показати все" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -38,53 +34,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Шукати" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "Вперед" @@ -110,7 +90,7 @@ msgstr "" msgid "Database %1$s has been created." msgstr "" -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Коментар бази даних: " @@ -137,17 +117,10 @@ msgstr "Назви колонок" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Тип" @@ -160,7 +133,7 @@ msgstr "Тип" msgid "Null" msgstr "Нуль" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -184,24 +157,18 @@ msgstr "Лінки до" msgid "Comments" msgstr "Коментарі" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Ні" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -210,15 +177,9 @@ msgstr "Ні" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -237,141 +198,133 @@ msgstr "Переглянути дамп (схему) БД" msgid "No tables found in database." msgstr "В БД не виявлено таблиць." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Відмітити все" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Зняти всі відмітки" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Команда" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Лише структуру" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Структуру і дані" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Лише дані" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Статус" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "дозволено" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair table" msgctxt "BLOB repository" msgid "Repair" msgstr "Ремонтувати таблицю" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "заблоковано" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Порівняння" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -380,14 +333,14 @@ msgstr "" "Додаткова можливість роботи із залінкованими таблицями деактивована. Для " "того, щоб довідатись чому, натисніть %sтут%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "Редагувати PDF Сторінки" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -396,11 +349,7 @@ msgstr "таблиця " #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Рядки" @@ -408,42 +357,30 @@ msgstr "Рядки" msgid "Size" msgstr "Розмір" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "використовується" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Створено" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Поновлено" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Перевірено" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -504,11 +441,7 @@ msgstr "Видалити" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "або" @@ -542,85 +475,85 @@ msgstr "Використовувати таблиці" msgid "SQL query on database %s:" msgstr "SQL-запит до БД %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Виконати запит" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Доступ заборонено" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "принаймі одне з слів" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "всі слова" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "точну фразу" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "регулярний вираз" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "Результати пошуку \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s співпадіння у таблиці %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Переглянути" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Видалити" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Разом: %s співпадіння" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Шукати в базі даних" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Слова чи значення, які потрібно знайти (маска: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Знайти:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Слова розділені пробілом (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Всередині таблиць:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -628,36 +561,36 @@ msgstr "Всередині таблиць:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Вставити" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Структура" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Знищити" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Очистити" @@ -667,117 +600,111 @@ msgstr "Очистити" msgid "Table %s has been emptied" msgstr "Таблицю %s було очищено" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Таблицю %s було знищено" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Всього" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "" -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "З відміченими:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Відмітити все" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Зняти усі відмітки" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Версія для друку" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Перевірити таблицю" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Оптимізувати таблицю" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Ремонтувати таблицю" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Аналіз таблиці" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Експорт" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Словник даних" @@ -788,10 +715,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -811,8 +738,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Дія" @@ -846,8 +773,8 @@ msgstr "" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "" @@ -922,7 +849,7 @@ msgstr "Закладку було видалено." msgid "Showing bookmark" msgstr "" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "" @@ -1001,296 +928,187 @@ msgstr "Порожнє ім'я хоста!" msgid "The user name is empty!" msgstr "Порожнє і'мя користувача!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Порожній пароль!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Паролі не однакові!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Додати нового користувача" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create" -msgid "Create User" -msgstr "Створити" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reloading the privileges" -msgid "Reloading Privileges" -msgstr "Перезавантаження прав" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Усунути відмічених користувачів" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "" -#: js/messages.php:57 -#, fuzzy -#| msgid "Log in" -msgid "Loading" -msgstr "Вхід в систему" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Процеси" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Search in database" -msgid "Renaming Databases" -msgstr "Шукати в базі даних" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "БД" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Database" -msgid "Copying Database" -msgstr "БД" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Набір символів" - -#: js/messages.php:69 -#, fuzzy -#| msgid "You have to choose at least one column to display" -msgid "Table must have atleast 1 column" -msgstr "Необхідно вибрати принаймі один Стовпчик для показу" - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create a page" -msgid "Create Table" -msgstr "Створити нову сторінку" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Шукати" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Модифікації було збережено" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Загальні можливості" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "заблоковано" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Виберіть поля для відображення" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "Немає" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Назад" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Дальше" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Разом" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr " Двійковий " -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Бер" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Квт" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Трв" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Чрв" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Лип" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Сер" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Жов" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Січ" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Лют" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Бер" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Квт" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1298,176 +1116,176 @@ msgid "May" msgstr "Трв" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Чрв" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Лип" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Сер" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Вер" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Жов" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Лис" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Гру" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Нд" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Пн" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Вт" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Пт" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Нд" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Пн" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Вт" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Ср" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Чт" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Пт" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Сб" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Нд" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Пн" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Вт" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Ср" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Чт" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Пт" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Сб" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "використовується" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1524,7 +1342,7 @@ msgstr "Індекси" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Унікальне" @@ -1542,7 +1360,7 @@ msgid "Comment" msgstr "" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1565,8 +1383,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Бази Даних" @@ -1732,11 +1550,7 @@ msgstr "Пароль:" msgid "Server Choice" msgstr "Вибір сервера" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "З цього моменту Cookies повинні бути дозволені." @@ -1817,11 +1631,7 @@ msgstr "" "recode_string поки буде завантажено extension reports. Перевірте Вашу php " "конфігурацію." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Якщо Ви отримаєте порожню сторінку, " "- значить все в порядку." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1859,47 +1661,27 @@ msgstr "" "Змінна $cfg['PmaAbsoluteUri'] ПОВИННА бути встановлена у Вашому " "конфіґураційному файлі!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Сервер" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "" @@ -1925,7 +1707,7 @@ msgstr "" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Документація" @@ -1939,136 +1721,136 @@ msgstr "SQL-запит" msgid "MySQL said: " msgstr "Відповідь MySQL: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Тлумачити SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Не тлумачити SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "без PHP коду" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "Створити PHP код" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "Не перевіряти SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "Перевірити SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Час" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Байт" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "кБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "МБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "ГБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%B %d %Y р., %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s днів, %s годин, %s хвилин і %s секунд" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Початок" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Назад" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Кінець" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "Перейти до бази даних "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2087,7 +1869,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Назва" @@ -2115,15 +1897,15 @@ msgstr "Запит згідно прикладу" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Привілеї" @@ -2142,11 +1924,7 @@ msgid "" msgstr "" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Надмірні видатки" @@ -2163,7 +1941,7 @@ msgstr "" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2173,36 +1951,22 @@ msgid "Change password" msgstr "Змінити пароль" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Без паролю" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Пароль" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Підтвердження" @@ -2215,20 +1979,12 @@ msgid "MySQL 4.0 compatible" msgstr "" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "" @@ -2241,17 +1997,23 @@ msgstr "Створити нову БД" msgid "Create" msgstr "Створити" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Без привілеїв" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "You have to choose at least one column to display" +msgid "Table must have at least one column." +msgstr "Необхідно вибрати принаймі один Стовпчик для показу" + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "Створити нову таблицю в БД %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of rows per page" msgid "Number of columns" @@ -2313,11 +2075,7 @@ msgid "remember template" msgstr "запам'ятати шаблон" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Кодування файлу:" @@ -2328,7 +2086,7 @@ msgstr "Стискання" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Немає" @@ -2370,11 +2128,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "вкажіть розташування текстового файлу" @@ -2382,20 +2136,12 @@ msgstr "вкажіть розташування текстового файлу" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Встановлений Вами каталог для завантаження файлів недоступний" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "каталог веб-сервера для завантаження файлів (upload directory)" @@ -2524,11 +2270,7 @@ msgstr "" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "" @@ -2598,14 +2340,14 @@ msgstr "Показано записи " msgid "total" msgstr "всього" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Запит виконувався %01.4f сек" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Змінити" @@ -2671,11 +2413,7 @@ msgstr "" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Разом" @@ -2920,11 +2658,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Формат" @@ -2996,13 +2730,8 @@ msgstr "" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Дані" @@ -3051,15 +2780,9 @@ msgstr "MIME-type" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Хост" @@ -3254,7 +2977,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "" @@ -3266,7 +2989,7 @@ msgstr "SQL result" msgid "Generated by" msgstr "Згенеровано" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL повернула пустий результат (тобто нуль рядків)." @@ -3411,20 +3134,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Первинний" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Індекс" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "ПовнТекст" @@ -3649,6 +3372,10 @@ msgstr "Цей формат не має опцій" msgid "not OK" msgstr "не OK" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "дозволено" @@ -3672,7 +3399,7 @@ msgstr "" "За інформацією як поновити Вашу таблицю Column_comments прошу дивитись у " "Документації" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Закладка на SQL-запит" @@ -3723,13 +3450,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Ім'я користувача" @@ -3746,22 +3468,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Змінна" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Значення" @@ -3779,40 +3493,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Довільний користувач" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Використовувати текстове поле" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Довільний хост" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Локальний" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Цей хост" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Використовувати Таблицю Хостів" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3836,7 +3521,6 @@ msgid "Use Host Table" msgstr "Використовувати Таблицю Хостів" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3870,29 +3554,29 @@ msgstr "" msgid "Servers" msgstr "" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Змінні" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Кодування" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Процеси" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3919,51 +3603,51 @@ msgstr "" msgid "Target database" msgstr "" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "Виконати SQL запит(и) до БД %s" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Назви колонок" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Закладка на даний SQL-запит" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Не перекривати цей запит в інших вікнах" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " Показати даний запит знову " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Виконати" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Лише перегляд" @@ -4141,13 +3825,13 @@ msgstr "" msgid "Save" msgstr "Зберегти" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add into comments" msgid "Add %s column(s)" msgstr "Додати коментар" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to add at least one column." @@ -4328,8 +4012,8 @@ msgstr "Перевстановити" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Користувач" @@ -4758,116 +4442,116 @@ msgstr "" msgid "View dump (schema) of databases" msgstr "Переглянути dump (схему) баз даних" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "Дозволити всі права за винятком GRANT." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Дозволити змінювати структуру наявних таблиць." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "" -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Дозволити створювати нові бази даних та таблиці." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "" -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Дозволити створювати нові таблиці." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Дозволити створювати тимчасові таблиці." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "" -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Дозволити знищувати дані з таблиць." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Дозволити знищувати бази даних та таблиці." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Дозволити знищувати таблиці." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Дозволити імпорт даних з файлів, та експорт у файли." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Дозволити додавання користувачів та прав без перезавантаження таблиці прав." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Дозволити створення та знищення індексів." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Дозволити вставку та заміну даних." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Дозволити блокування таблиць для біжучих потоків." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Обмежити кількість нових під'єднань, які користувач може створювати протягом " "години." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Обмежити кількість запитів, які користувач може надіслати серверу протягом " "години." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -4875,58 +4559,58 @@ msgstr "" "Обмежити кількість команд, що вносять зміни до будь-якої таблиці чи бази " "даних, які користувач може виконати протягом години." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "" -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "Неефективно для цієї версії MySQL." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "Дозволити перезавантаження установок та очищення кешу сервера." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "Надати користувачу право запитувати де є slaves / masters." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Необхідно для реплікації slaves." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Дозволити читання даних." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Надати доступ до повного списку баз даних." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Дозволити вимкнення сервера." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -4936,156 +4620,156 @@ msgstr "" "під'єднань; Обов'язково для більшості адміністративних операцій таких як " "встановлення ґлобальних змінних чи припинення процесів інших користувачів." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Дозволити зміну даних." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Немає прав." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Немає" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Права, які стосуються таблиці" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " Зауваження: привілеї MySQL задаються по-англійськи " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Глобальні права" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Права, які стосуються бази даних" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Адміністратор" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Обмеження ресурсів" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "Примітка: Встановлення цієї опції у 0 (нуль) знімає обмеження." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Вхідна інформація (Login)" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Не змінювати пароль" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Не знайдено користувача." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "Користувач %s вже існує!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Було додано нового користувача." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, fuzzy, php-format msgid "You have updated the privileges for %s." msgstr "Було змінено привілеї для" -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "Ви змінили привілеї для %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "Пароль для %s успішно змінено." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "Усунути %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Перезавантаження прав" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Відмічених користувачів успішно усунуто." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Права успішно перезавантажено." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Редагування привілеїв" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Відмінити" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Огляд користувачів" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "Grant" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Довільний" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Додати нового користувача" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Усунути відмічених користувачів" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "Відмінити всі активні права користувачів та усунути їх після цього." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Усунути бази даних, які мають такі ж назви як імена користувачів." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5098,50 +4782,50 @@ msgstr "" "сервером, якщо в цю таблицю вносилися зміни вручну. У цьому випадку Вам " "необхідно %sперезавантажити права%s перед продовженням." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Вказаного користувача не знайдено в таблиці прав." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Права, які стосуються колонок таблиці" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Додати права для цієї бази даних" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Додати права для цієї таблиці" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Змінити реєстраційні дані / Копіювати користувача" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Створити нового користувача з такими ж правами і ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... залишити старого." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... знищити старого з таблиці користувачів." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" " ... анулювати всі активні права старого користувача, знищивши його після " "того." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5149,44 +4833,44 @@ msgstr "" " ... знищити старого з таблиці користувачів та перевантажити права після " "того." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Немає" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "Користувачі, котрі мають доступ до "%s"" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "глобальний" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "специфічний для бази даних" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "шаблон" @@ -7768,25 +7452,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Мітка" @@ -7838,13 +7522,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Повернутись" @@ -7923,7 +7600,7 @@ msgstr "(\"PRIMARY\" повинно бути іменем лише msgid "Add to index  %s column(s)" msgstr "Додати до індексу %s колоноку(и)" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -8037,41 +7714,6 @@ msgstr "Перевір цілісність даних на рівні поси msgid "Show tables" msgstr "Показати таблиці" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Простір, що використовується" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Використання" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Ефективність" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Статистика рядка" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Параметр" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "динамічний" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Довжина рядка" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Простір, що використовується" @@ -8105,7 +7747,6 @@ msgid "Row length" msgstr "Довжина рядка" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " Розмір рядка " @@ -8177,50 +7818,50 @@ msgstr "Немає" msgid "Column %s has been dropped" msgstr "Таблицю %s було знищено" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "Було додано первинний ключ до %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "Було додано індекс для %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Перегляд залежностей" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Запропонувати структуру таблиці" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add into comments" msgid "Add column" msgstr "Додати коментар" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "У кінці таблиці" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "На початку таблиці" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "Після %s" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "Створити індекс на %s колонках" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8262,6 +7903,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/ur.po b/po/ur.po old mode 100755 new mode 100644 index aacdc5e29..f7ef5857a --- a/po/ur.po +++ b/po/ur.po @@ -6,11 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-05-14 12:35+0200\n" "Last-Translator: \n" "Language-Team: Urdu \n" @@ -22,11 +18,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "سبھی دکھاو" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -45,53 +41,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "تلاش" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "جائو" @@ -117,7 +97,7 @@ msgstr "یہ ویلیو استعمال کریں" msgid "Database %1$s has been created." msgstr "بن گئی ہے %1$s ڈیٹا بیس" -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "ڈیٹا بیس رائے" @@ -144,17 +124,10 @@ msgstr "کمانڈ" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "قِسم" @@ -167,7 +140,7 @@ msgstr "قِسم" msgid "Null" msgstr "منسوخ" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -191,24 +164,18 @@ msgstr "لنک ٹو" msgid "Comments" msgstr "آراء-رائے" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "نہیں" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -217,15 +184,9 @@ msgstr "نہیں" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -244,135 +205,127 @@ msgstr " ڈیٹا بیس کی ڈمپ (شیما) دیکھیں" msgid "No tables found in database." msgstr "ڈیٹا بیس میں کوئی ٹیبل نہیں مِلا" -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "سارا منتخب کریں" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "سارا انتخاب ختم کریں" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "ڈیٹا بیس کا نام خالی ہے!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "Database %s has been renamed to %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "Database %s has been copied to %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "ڈیٹا بیس کا نام بدلیں" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "کمانڈ" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "اور پھر" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "ڈیٹا بیس کاپی کریں" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "سٹرکچر صرف" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "سٹرکچر اور ڈیٹا" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "صرف ڈیٹا" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "کاپی سے پہلے ڈیٹا بیس بنائیں" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "شامل کریں %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "ویلیو شامل کریں AUTO_INCREMENT" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Add constraints" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Switch to copied database" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "BLOB Repository" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "حالت" -#: db_operations.php:559 +#: db_operations.php:548 msgctxt "BLOB repository" msgid "Enabled" msgstr "فعال" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "غیر فعال" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "ضرر" -#: db_operations.php:577 +#: db_operations.php:566 msgctxt "BLOB repository" msgid "Repair" msgstr "مرمت" -#: db_operations.php:585 +#: db_operations.php:574 msgctxt "BLOB repository" msgid "Disabled" msgstr "غیر فعال" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "فعال" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "کولیکشن" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -381,14 +334,14 @@ msgstr "" "The additional features for working with linked tables have been " "deactivated. To find out why click %shere%s." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "پی ڈی ایف صفحوں کی تدوین کریں" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -397,11 +350,7 @@ msgstr "ٹیبل" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "" @@ -409,42 +358,30 @@ msgstr "" msgid "Size" msgstr "ناپ" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "استعمال میں" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "تخلیق" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "آخری دفعہ اپ ڈیٹ" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "آخری دفعہ چیک" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -505,11 +442,7 @@ msgstr "Del" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "یا" @@ -543,85 +476,85 @@ msgstr "ٹیبلز استعمال کریں" msgid "SQL query on database %s:" msgstr "SQL query on database %s:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "Submit Query" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "رسائی سے انکار" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "کم از کم لفظوں میں سے ایک" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "تمام الفاظ" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "برابر فقرہ" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "as regular expression" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "تلاش نتائج کیلئے \"%s\" %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s match(es) inside table %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Browse" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "ختم" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Total: %s match(es)" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "ڈیٹا بیس میں تلاش" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Word(s) or value(s) to search for (wildcard: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "تلاش:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Words are separated by a space character (\" \")." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "ٹیبلز کے اندر:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -629,36 +562,36 @@ msgstr "فیلڈ کے اندر:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "داخل کریں" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "ساخت" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "نکلالنا" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "خالی" @@ -668,25 +601,25 @@ msgstr "خالی" msgid "Table %s has been emptied" msgstr " %s ٹیبل" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "View %s has been dropped" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "Table %s has been dropped" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "ٹریکنگ ایکٹو ہے" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "ٹریکنگ ایکٹو نہیں ہے" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -695,92 +628,86 @@ msgstr "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "ویو" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "لپیٹنا" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "مجموعہ" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s is the default storage engine on this MySQL server." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "With selected:" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "چیک آل" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "ان چیک آل" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "اوورہیڈ ٹیبلز چیک کریں" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "پرنٹ ویو" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "ٹیبل چیک کریں" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "ٹیبلز آپٹی مائز " -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "ٹیبلز مرمت کریں" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "ٹیبلز کا تجزیہ" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "برآمد" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "ڈیٹا ڈتشنری" @@ -791,10 +718,10 @@ msgstr "ٹریکڈ ٹیبلز" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -814,8 +741,8 @@ msgstr "اپ ڈیٹ کیا گیا" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "عمل" @@ -849,8 +776,8 @@ msgstr "سٹرکچر کی تصویر" msgid "Untracked tables" msgstr "ان ٹریکڈ ٹیبلز" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "ٹریک ٹیبل" @@ -931,7 +858,7 @@ msgstr "The bookmark has been deleted." msgid "Showing bookmark" msgstr "Showing bookmark" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "Bookmark %s created" @@ -1012,415 +939,318 @@ msgstr "ہوسٹ نام خالی ہے!" msgid "The user name is empty!" msgstr "صارف کا نام خالی ہے" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "پاس ورڈ خالی ہے" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "پاس ورڈ ایک جیسے نہیں ہیں" -#: js/messages.php:46 -msgid "Add a New User" -msgstr "" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Created" -msgid "Create User" -msgstr "تخلیق کیا گیا" - -#: js/messages.php:48 -msgid "Reloading Privileges" -msgstr "" - -#: js/messages.php:49 -msgid "Removing Selected Users" -msgstr "" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "منسوخ" -#: js/messages.php:57 -msgid "Loading" -msgstr "" - -#: js/messages.php:58 -msgid "Processing Request" -msgstr "" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "ڈیٹا بیس کا نام بدلیں" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "ڈیٹا بیس" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "ڈیٹا بیس کاپی کریں" - -#: js/messages.php:68 -msgid "Changing Charset" -msgstr "" - -#: js/messages.php:69 -#, fuzzy -#| msgid "You have to choose at least one column to display" -msgid "Table must have atleast 1 column" -msgstr "آپ کو کم از کم ایک کالم چننا ہو گا ڈسپے کیلئے۔" - -#: js/messages.php:70 -#, fuzzy -#| msgid "Created" -msgid "Create Table" -msgstr "تخلیق کیا گیا" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "تلاش" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "تبدیلیاں محفوظ ہو چکی ہیں" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "ریلیشن حذف ہو گیا" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "FOREIGN KEY relation added" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "اندرونی ریلیشن شامل ہو گیا" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "غلطی:ریلیشن شامل نہیں ہوا" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "غلطی : ریلیشن پہلے سے موجود ہے" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Error saving coordinates for Designer." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "جنرل ریلیشن فیچرز" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "غیر فعال" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "You have to choose at least one column to display" msgid "Choose column to display" msgstr "آپ کو کم از کم ایک کالم چننا ہو گا ڈسپے کیلئے۔" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 msgid "Done" msgstr "" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 msgid "Prev" msgstr "" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 msgid "Today" msgstr "" -#: js/messages.php:111 +#: js/messages.php:82 msgid "January" msgstr "" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 msgid "March" msgstr "" -#: js/messages.php:114 +#: js/messages.php:85 msgid "April" msgstr "" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "" -#: js/messages.php:116 +#: js/messages.php:87 msgid "June" msgstr "" -#: js/messages.php:117 +#: js/messages.php:88 msgid "July" msgstr "" -#: js/messages.php:118 +#: js/messages.php:89 msgid "August" msgstr "" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 msgid "October" msgstr "" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 msgctxt "Short month name" msgid "May" msgstr "" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "" -#: js/messages.php:151 +#: js/messages.php:122 msgid "Sunday" msgstr "" -#: js/messages.php:152 +#: js/messages.php:123 msgid "Monday" msgstr "" -#: js/messages.php:153 +#: js/messages.php:124 msgid "Tuesday" msgstr "" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 msgid "Friday" msgstr "" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 msgid "Su" msgstr "" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 msgid "Mo" msgstr "" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 msgid "Tu" msgstr "" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 msgid "We" msgstr "" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 msgid "Th" msgstr "" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 msgid "Fr" msgstr "" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 msgid "Sa" msgstr "" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 msgid "Minute" msgstr "" -#: js/messages.php:195 +#: js/messages.php:166 msgid "Second" msgstr "" @@ -1475,7 +1305,7 @@ msgstr "" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "" @@ -1493,7 +1323,7 @@ msgid "Comment" msgstr "" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1516,8 +1346,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "" @@ -1679,11 +1509,7 @@ msgstr "" msgid "Server Choice" msgstr "" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "" @@ -1758,11 +1584,7 @@ msgid "" "necessary extensions appear to be loaded. Check your PHP configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "" @@ -1857,7 +1651,7 @@ msgstr "en" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "" @@ -1871,136 +1665,136 @@ msgstr "" msgid "MySQL said: " msgstr "" -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "" #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "" #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "" -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2019,7 +1813,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "" @@ -2047,15 +1841,15 @@ msgstr "" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "" @@ -2074,11 +1868,7 @@ msgid "" msgstr "" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "" @@ -2095,7 +1885,7 @@ msgstr "" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2105,36 +1895,22 @@ msgid "Change password" msgstr "" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "" @@ -2147,20 +1923,12 @@ msgid "MySQL 4.0 compatible" msgstr "" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "" @@ -2173,17 +1941,23 @@ msgstr "" msgid "Create" msgstr "" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "You have to choose at least one column to display" +msgid "Table must have at least one column." +msgstr "آپ کو کم از کم ایک کالم چننا ہو گا ڈسپے کیلئے۔" + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 msgid "Number of columns" msgstr "" @@ -2242,11 +2016,7 @@ msgid "remember template" msgstr "" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "" @@ -2257,7 +2027,7 @@ msgstr "" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "" @@ -2299,11 +2069,7 @@ msgstr "" msgid "File to import" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "" @@ -2311,20 +2077,12 @@ msgstr "" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "" @@ -2451,11 +2209,7 @@ msgstr "" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "" @@ -2523,14 +2277,14 @@ msgstr "" msgid "total" msgstr "" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "" @@ -2596,11 +2350,7 @@ msgstr "" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "" @@ -2845,11 +2595,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "" @@ -2913,13 +2659,8 @@ msgstr "" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "" @@ -2968,15 +2709,9 @@ msgstr "" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "" @@ -3169,7 +2904,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "" @@ -3181,7 +2916,7 @@ msgstr "" msgid "Generated by" msgstr "" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "" @@ -3324,20 +3059,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "" @@ -3562,6 +3297,10 @@ msgstr "" msgid "not OK" msgstr "" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "" @@ -3583,7 +3322,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "" @@ -3634,13 +3373,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "" @@ -3657,22 +3391,14 @@ msgstr "" msgid "Slave status" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "" @@ -3690,40 +3416,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3747,7 +3444,6 @@ msgid "Use Host Table" msgstr "" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3781,29 +3477,29 @@ msgstr "" msgid "Servers" msgstr "" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3830,51 +3526,51 @@ msgstr "" msgid "Target database" msgstr "" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Comments" msgid "Columns" msgstr "آراء-رائے" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr "" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "" @@ -4016,12 +3712,12 @@ msgstr "" msgid "Save" msgstr "" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, php-format msgid "Add %s column(s)" msgstr "" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to add at least one column." @@ -4155,8 +3851,8 @@ msgstr "" msgid "Protocol version" msgstr "" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "" @@ -4571,320 +4267,320 @@ msgstr "" msgid "View dump (schema) of databases" msgstr "" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "" -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "" -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "" -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "" -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "" -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "" -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "" -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "" -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "" -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "" -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "" -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "" -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "" -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "" -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "" -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." msgstr "" -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "" -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "" -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "" -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "" -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "" -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "" -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " "killing threads of other users." msgstr "" -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "" -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "" -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 msgctxt "None privileges" msgid "None" msgstr "" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr "" -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 msgid "No user found." msgstr "" -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "" -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "" -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "" -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "" -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "" -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "" -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -4893,89 +4589,89 @@ msgid "" "sreload the privileges%s before you continue." msgstr "" -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "" -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "" -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "" -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr "" -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr "" -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 msgctxt "Create none database for user" msgid "None" msgstr "" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "" @@ -7545,25 +7241,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "" @@ -7613,13 +7309,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "اور پھر" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "" @@ -7698,7 +7387,7 @@ msgstr "" msgid "Add to index  %s column(s)" msgstr "" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "" @@ -7810,41 +7499,6 @@ msgstr "" msgid "Show tables" msgstr "" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "" @@ -7878,7 +7532,6 @@ msgid "Row length" msgstr "" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "" @@ -7944,49 +7597,49 @@ msgstr "" msgid "Column %s has been dropped" msgstr "Table %s has been dropped" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add/Delete Field Columns" msgid "Add column" msgstr "فیلڈ کالمز شامل یا ختم کریں" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, php-format msgid "Create an index on  %s columns" msgstr "" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8028,6 +7681,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/uz.po b/po/uz.po old mode 100755 new mode 100644 index a139a307b..07c019fee --- a/po/uz.po +++ b/po/uz.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:20+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: uzbek_cyrillic \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Барчасини кўрсатиш" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -40,53 +36,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Қидириш" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "OK" @@ -112,7 +92,7 @@ msgstr "Ушбу қийматни ишлатиш" msgid "Database %1$s has been created." msgstr " %1$s маълумотлар базаси тузилди." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Маълумотлар базасига изоҳ:" @@ -139,17 +119,10 @@ msgstr "Майдон номлари" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Тур" @@ -162,7 +135,7 @@ msgstr "Тур" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -186,24 +159,18 @@ msgstr "Алоқалар" msgid "Comments" msgstr "Изоҳлар" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Йўқ" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -212,15 +179,9 @@ msgstr "Йўқ" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -239,141 +200,133 @@ msgstr "Маълумотлар базаси дампини (схемасини) msgid "No tables found in database." msgstr "Маълумотлар базасида биронта ҳам жадвал мавжуд эмас." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Барчасини белгилаш" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Белгилашни бекор қилиш" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Маълумотлар базаси номи бўш!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr " `\"%s\"` маълумотлар базасининг номи `\"%s\"` деб ўзгартирилди." -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "\"%s\" маълумотлар базасидан \"%s\" га нусха кўчирилди." -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Маълумотлар базаси номини қуйидагига ўзгартириш" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Буйруқ" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "ва сўнг" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Маълумотлар базасидан қуйидагига нусха олиш" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Фақат тузилиши" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Тузилиши ва маълумотлари" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Фақат маълумотлар" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "Нусха кўчиришдан олдин маълумотлар базаси тузинг (CREATE DATABASE)" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "\"%s\" қўшиш" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "AUTO_INCREMENT қўшиш" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Чекловлар қўшиш" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Нусха олинган маълумотлар базасига ўтиш" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "BLOB омбори" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Ҳолат" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Фаоллаштирилган" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Фаолсизлантириш" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Шикастланган" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair" msgctxt "BLOB repository" msgid "Repair" msgstr "Тиклаш" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Фаолсизлантирилган" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Фаоллантириш" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Таққослаш" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -382,14 +335,14 @@ msgstr "" "Алоқадор жадваллар билан ишлаш учун қўшимча имкониятлар мавжуд эмас. " "Сабабларини аниқлаш учун %sбу ерга%s босинг." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "PDF-саҳифаларни таҳрирлаш" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -398,11 +351,7 @@ msgstr "Жадвал " #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Қаторларсони" @@ -410,42 +359,30 @@ msgstr "Қаторларсони" msgid "Size" msgstr "Ҳажми" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "ишлатилмоқда" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Тузиш" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Охирги янгиланиш" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Охирги текширув" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -506,11 +443,7 @@ msgstr "Ўчириш" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Ёки" @@ -544,85 +477,85 @@ msgstr "Жадвалларни ишлатиш" msgid "SQL query on database %s:" msgstr "\"%s\" маълумотлар базасига SQL-сўров: " -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "сўровни бажариш" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Рухсат берилмади" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "сўзлардан бири" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "барча сўзлар" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "аниқ мослик" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "мунтазам ибора" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "\"\"%s\"\" учун қидирув натижалари \"%s\":" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "\"%s\" жадвалида ўхшашликлар сони \"%s\" та" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Кўриб чиқиш" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "Ўчириш" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Жами: \"%s\" ўхшашлик" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Маълумотлар базасида қидириш" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "Қидириш учун сўз(лар) ёки қиймат(лар) (ўрнига қўйиш белгиси: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Излаш:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "Сўзлар бўш жой (\" \") ёрдамида бўлинган." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Қуйидаги жадвал(лар)да қидириш:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -630,36 +563,36 @@ msgstr "Қуйидаги майдон(лар)да қидириш: " #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Қўйиш" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Тузилиши" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "Ўчириш" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Тозалаш" @@ -669,25 +602,25 @@ msgstr "Тозалаш" msgid "Table %s has been emptied" msgstr "\"%s\" жадвали тозаланди" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr " \"%s\" намойиши ўчирилди" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "\"%s\" жадвали ўчирилди" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "Кузатиш фаол." -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "Кузатиш фаол эмас." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -696,92 +629,86 @@ msgstr "" "Ушбу намойиш камида кўрсатилган миқдорда қаторларга эга. Батафсил маълумот " "учун %sдокументацияга%s қаранг." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Намойиш" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Репликация (захира нусха кўчириш)" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Жами" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "\"%s\" - MySQL серверидаги андозавий маълумотлар жадвали тури." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Белгиланганларни: " -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Барчасини белгилаш" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Белгилашни бекор қилиш" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Оптималлаштириш лозим бўлгн жадвалларни белгилаш" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Чоп этиш версияси" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Жадвални текшириш" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Жадвални оптималлаштириш" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Жадвални тиклаш" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Жадвал таҳлили" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Экспорт" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Маълумотлар луғати" @@ -792,10 +719,10 @@ msgstr "Кузатилган жадваллар" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -815,8 +742,8 @@ msgstr "Янгиланди" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Амал" @@ -850,8 +777,8 @@ msgstr "Тузилма расми" msgid "Untracked tables" msgstr "Кузатилмаган жадваллар" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "Жадвални кузатиш" @@ -937,7 +864,7 @@ msgstr "Хатчўп ўчирилди." msgid "Showing bookmark" msgstr "Хатчўпларни кўрсатиш" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "\"%s\" хатчўпи тузилди" @@ -1025,296 +952,187 @@ msgstr "Хост номи бўш!" msgid "The user name is empty!" msgstr "Фойдаланувчи номи белгиланмаган!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Парол белгиланмаган!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Киритилган пароллар бир хил эмас!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Янги фойдаланувчи қўшиш" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create version" -msgid "Create User" -msgstr "Версиясини тузиш" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Привилегияларни қайта юклаш" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Белгиланган фойдаланувчиларни ўчириш" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "Ёпиш" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Бекор қилиш" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Юклаш" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Жараёнлар" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Маълумотлар базаси номини қуйидагига ўзгартириш" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Маълумотлар базаси" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Маълумотлар базасидан қуйидагига нусха олиш" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Кодировка" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Жадвалда, ҳеч бўлмаганда, битта майдон бўлиши шарт." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Жадвал тузиш" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Қидириш" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "Ўзгариришлар сақланди" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Алоқа ўчирилди" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "Ташқи калитга (FOREIGN KEY) алоқа ўрнатилди" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Ички алоқа ўрнатилди" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Хатолик: Боғлиқлик ўрнатилмади." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Хатолик: Боғлиқлик аллақачон мавжуд." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Координаталарни сақлашда хатолик." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Алоқаларнинг асосий имкониятлари" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Фаолсизлантирилган" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Боғлиқ калитни танланг" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Ташқи калитни танланг" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "Бирламчи (PRIMARY) ёки уникал (UNIQUE) индекс бўлган майдонни танланг!" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Кўрсатиладиган майдонни танлаш" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "Donate" msgid "Done" msgstr "Садақа" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Орқага" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Кейинги" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Жами" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Иккилик" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Мар" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Апр" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "Май" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Июн" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Июл" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Авг" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Окт" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Янв" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Фев" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Мар" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Апр" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1322,178 +1140,178 @@ msgid "May" msgstr "Май" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Июн" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Июл" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Авг" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Сен" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Окт" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Ноя" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Дек" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Якш" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Душ" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Сеш" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Жум" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Якш" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Душ" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Сеш" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Чор" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Пай" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Жум" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Шан" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Якш" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Душ" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Сеш" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Чор" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Пай" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Жум" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Шан" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "Вики" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "ишлатилмоқда" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1556,7 +1374,7 @@ msgstr "Индекслар" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Уникал" @@ -1574,7 +1392,7 @@ msgid "Comment" msgstr "Изоҳ" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1597,8 +1415,8 @@ msgid "" "removed." msgstr " %1$s ва %2$s индекслари бир хил, улардан бирини ўчириш мумкин." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Маълумотлар базалари" @@ -1768,11 +1586,7 @@ msgstr "Парол:" msgid "Server Choice" msgstr "Серверни танланг" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Браузерда \"cookies\" фаоллаштирилган бўлиши шарт." @@ -1858,11 +1672,7 @@ msgstr "" "\"recode_string\" функциясини ишлатиб бўлмади. Эҳтимол, PHP ни созлашда " "хатолик мавжуд." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Агар бўм-бўш саҳифа кўрсатилса, демак, ҳаммаси жойида." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr " \"%1$s\" файлидан андоза конфигурацияни юклаб бўлмади." -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1899,51 +1701,31 @@ msgstr "" "$cfg[\"PmaAbsoluteUrl\"] директиваси конфигурацион файлда созланиши " "ШАРТ!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Сервер рақами нотўғри: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" " %1$s сервери учун нотўғри хост номи кўрсатилган. phpMyAdmin конфигурацион " "файлида белгиланган созлашларни тўғирланг." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Сервер" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -======= #: libraries/common.inc.php:816 ->>>>>>> origin/master msgid "Invalid authentication method set in configuration:" msgstr "" "phpMyAdmin конфигурацион файлида нотўғри аутентификация усули белгиланган:" -<<<<<<< HEAD -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr " \"%s\" ни \"%s\" версияга ёки каттароқ версияга янгилаш зарур." @@ -1971,7 +1753,7 @@ msgstr "Юборилди" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Документация" @@ -1985,140 +1767,140 @@ msgstr "SQL сўрови" msgid "MySQL said: " msgstr "MySQL жавоби: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "Сўров таҳлили" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Таҳлил керак эмас" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "PHP-код олиб ташлаш" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "PHP-код" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Янгилаш" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "SQL синтаксиси текширувини олиб ташлаш" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "SQL тўғрилигини текшириш" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Жадвал турлари" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Профиллаштириш" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Вақт" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Байт" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "КБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "МБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "ГБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "ТБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "ПБ" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "ЭБ" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr " " #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d %B %Y й., %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "\"%s\" кун, \"%s\" соат, \"%s\" минут ва \"%s\" секунд" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Боши" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Орқага" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Охири" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr " \"%s\" маълумотлар базасига ўтиш" -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" " \"%s\" параметрининг иши маълум хатоликка олиб келиши мумкин, батафсил " "маълумот учун қаранг \"%s\"" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2139,7 +1921,7 @@ msgid "Events" msgstr "Ҳодисалар" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Номи" @@ -2167,15 +1949,15 @@ msgstr "Сўров" msgid "Designer" msgstr "Дизайнер" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Импорт" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Привилегиялар" @@ -2196,11 +1978,7 @@ msgstr "" "3.11\"[/a]га қаранг" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Фрагментланган" @@ -2219,7 +1997,7 @@ msgstr "Сервер жавоб бермаяпти" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(ёки локал MySQL сервернинг сокети нотўғри созланган)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Тафсилотлар..." @@ -2229,36 +2007,22 @@ msgid "Change password" msgstr "Паролни ўзгартириш" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Парол йўқ" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Парол" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Тасдиқлаш" @@ -2273,20 +2037,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 га мос" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Парол ўрнатиш" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Генерация қилиш" @@ -2299,17 +2055,23 @@ msgstr "Янги маълумотлар базаси тузиш" msgid "Create" msgstr "Тузиш" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Привилегиялар йўқ" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Жадвалда, ҳеч бўлмаганда, битта майдон бўлиши шарт." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "\"%s\" маълумотлар базасида янги жадвал тузиш" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2376,11 +2138,7 @@ msgid "remember template" msgstr " шаблонни ёдда тутиш" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Файл кодировкаси: " @@ -2391,7 +2149,7 @@ msgstr "Сиқиш" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Йўқ" @@ -2438,11 +2196,7 @@ msgstr "" msgid "File to import" msgstr "Импорт қилинаётган файл " -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Файлни танлаш" @@ -2450,20 +2204,12 @@ msgstr "Файлни танлаш" msgid "File uploads are not allowed on this server." msgstr "Файлларни серверга юклаб бўлмади." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Кўрсатилган каталокка юклаб бўлмади" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "Юклаш каталогидан" @@ -2600,11 +2346,7 @@ msgstr "Индекс бўйича сортировка қилиш" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Параметрлар" @@ -2674,14 +2416,14 @@ msgstr "Ёзувларни кўрсатиш" msgid "total" msgstr "жами" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "Сўров %01.4f секунд вақт олди" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "Ўзгартириш" @@ -2751,11 +2493,7 @@ msgstr "Ишлатилиш" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Жами" @@ -3043,11 +2781,7 @@ msgstr "" "рақамланади." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Формат" @@ -3121,13 +2855,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Маълумотлар" @@ -3176,15 +2905,9 @@ msgstr "MIME тури" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Хост" @@ -3379,7 +3102,7 @@ msgstr "Таркибини экспорт қилиш" msgid "Open new phpMyAdmin window" msgstr "phpMyAdmin дастурини янги ойнада очиш" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "Янги жадвал" @@ -3391,7 +3114,7 @@ msgstr "SQL сўрови натижаси" msgid "Generated by" msgstr "Тузилган" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL бўш натижа берди (яъни нольта сатр)." @@ -3546,20 +3269,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Бирламчи" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Индекс" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Матн тўлалигича" @@ -3784,6 +3507,10 @@ msgstr "Ушбу формат учун созланадиган параметр msgid "not OK" msgstr "Тайёр эмас" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Фаоллаштирилган" @@ -3807,7 +3534,7 @@ msgstr "" "\"column_comments\" жадвалини янгилаш зарур. Батафсил маълумот учун " "документацияга қаранг." -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Хатчўп қўйилган SQL сўрови" @@ -3866,13 +3593,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Фойдаланувчи номи" @@ -3889,22 +3611,14 @@ msgstr "Бош сервер статуси" msgid "Slave status" msgstr "Тобе сервер статуси" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "Ўзгарувчи" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Қиймати" @@ -3924,40 +3638,11 @@ msgstr "" msgid "Add slave replication user" msgstr "Тобе репликация фойдаланувчисини қўшиш" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Ҳар қайси фойдаланувчи" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Матнмайдонини ишлатиш" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Ҳар қайси хост" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Локал" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Ушбу хост" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Хостлар жадвалидан фойдаланиш" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3981,7 +3666,6 @@ msgid "Use Host Table" msgstr "Хостлар жадвалидан фойдаланиш" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -4017,29 +3701,29 @@ msgstr "Номаълум тил: %1$s." msgid "Servers" msgstr "Серверлар" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "Ўзгарувчилар" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Кодировкалар" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Жадвал турлари" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Иккилик журнал" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Жараёнлар" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Синхронизация қилиш" @@ -4066,51 +3750,51 @@ msgstr "Фарқ" msgid "Target database" msgstr "Нишон база" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "\"%s\" серверида SQL-сўров(лар)ни бажариш " -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "\"%s\" маълумотлар базасида SQL-сўров(лар)ни бажариш" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Майдон номлари" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Ушбу SQL сўровига хатчўп тузиш" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Барча фойдаланувчиларга рухсат бериш" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Шу номли хатчўпни алмаштириш" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "Сўровлар ойнаси ичидаги маълумотларни блокировка қилиш" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Тақсимловчи" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr "Ушбу сўровни қайта кўрсатиш" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Бажариш" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Фақат кўриш" @@ -4287,13 +3971,13 @@ msgstr "Бўлакларни (PARTITIONS) белгилаш" msgid "Save" msgstr "Сақлаш" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add column(s)" msgid "Add %s column(s)" msgstr "Устун(лар) қўшиш" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4510,8 +4194,8 @@ msgstr "Тозалаш" msgid "Protocol version" msgstr "Протокол версияси" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Фойдаланувчи" @@ -4975,114 +4659,114 @@ msgstr "Жадвал турлари" msgid "View dump (schema) of databases" msgstr "Маълумотлар базалари дампини (схемасини) намойиш этиш" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "GRANT дан ташқари барча привилегияларни ўз ичига олади" -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Мавжуд жадвалларнинг тузилишини ўзгартиришга рухсат беради" -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Сақланадиган муолажаларни ўзгартириш ва ўчиришга рухсат беради" -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Янги маълумотлар базалари ва жадваллар тузишга рухсат беради" -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Сақланадиган муолажалар тузишга рухсат беради" -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Янги жадваллар тузишга рухсат беради" -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Вақтинчалик жадваллар тузишга рухсат беради" -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "Фойдаланувчилар ҳисобини қўшиш, ўчириш ва ўзгартиришга рухсат беради" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Янги намойишлар тузиш(CREATE VIEW)га рухсат беради" -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Маълумотларни ўчиришга рухсат беради" -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Маълумотлар базаларини ва жадвалларни ўчиришга рухсат беради" -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Жадвалларни ўчиришга рухъсат беради" -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Кечиктирилган ҳодисаларни созлашга рухсат беради" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Сақланадиган муолажаларни бажаришга рухсат беради" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Маълумотларни файлдан импорт ва файлга экспорт қилишга рухсат беради" -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Фойдаланувчиларни қўшиш ва привилегиялар жадвалини қайта юкламасдан " "привилегиялар қўшишга рухсат беради" -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Индекслар қўшиш ва уларни ўчиришга рухсат беради" -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Маълумот қўйиш ва ўзгартиришга рухсат беради" -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Жорий оқим учун жадвални блокировку қилишга рухсат беради" -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Фойдаланувчи бир соат давомида ўрнатиши мумкин бўлган янги уланишлар сони" -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "Фойдаланувчи бир соат давомида юбориши мумкин бўлган сўровлар сони" -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5090,64 +4774,64 @@ msgstr "" "Фойдаланувчи бир соат давомида бажариши мумкин бўлган бирон-бир жадвал ёки " "маълумотлар базасини ўзгартирадиган буйруқлар сони" -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "" "Бир фойдаланувчи томонидан бир вақтнинг ўзида ўрнатиши мумкин бўлган " "уланишлар сони" -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Барча фойдаланувчиларнинг жараёнларини кўришга рухсат беради" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "MySQL-сервернинг ушбу версияда бундай хусусият мавжуд эмас!" -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Сервер созланишларини қайта юклашга ва унинг кешларини тозалашга рухсат " "беради" -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" "Бош ва тобе серверларнинг жойлашиши ҳақидаги маълумотни талаб қилишга рухсат " "беради" -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "Репликация (захира нусха кўчириш) вақтида тобе серверлар учун керак" -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Маълумотларни чақиришга рухсат беради" -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Маълумотлар базаларининг тўлиқ рўйхатига рухсат беради" -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Намойиш тузадиган сўров(SHOW CREATE VIEW)ни бажаришга рухсат беради" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Сервер ишини якунлашга рухсат беради" -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5157,162 +4841,162 @@ msgstr "" "(Кўпгина административ вазифаларни бажариш учун керак, масалан, глобал " "ўзгарувчилар ўрнатиш ёки бошқа фойдаланувчи жараёнини ўчириш)" -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "" "Триггерлар (маълум шартлар бажарилганда автоматик ишга тушадиган жараёнлар) " "тузиш ва уларни ўчиришга рухсат беради" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Маълумотларни ўзгартиришга рухсат беради" -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Привилегиялар йўқ" -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Йўқ" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Жадвал даражасижаги привилегиялар" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr "ИЗОҲ: MySQL привилегиялари турлари инглиз тилида кўрсатилади." -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Глобал привилегиялар" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Маълумотлар базаси привилегиялари" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Администрация" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Ресурслардан фойдаланишни чеклаш" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" "ИЗОҲ: параметр қийматларини 0 (нол) деб белгилаш мавжуд чеклашларни бекор " "қилади." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Фойдаланувчи ҳисоби ҳақида маълумот" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Паролни ўзгартирмаслик" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Биронта ҳам фойдаланувчи топилмади." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr " \"%s\" номли фойдаланувчи мавжуд!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Сиз янги фойдаланувчи қўшдингиз." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr " \"%s\" учун привилегиялар ўзгартирилди." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr " \"%s\" фойдаланувчининг привилегиялари бекор қилинди." -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "\"%s\" фойдаланувчининг пароли муваффақиятли ўзгартирилди." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "\"%s\" ўчирилмоқда" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "Ўчириш лозим бўлган фойдаланувчилар танланмаган!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Привилегиялар қайта юкланмоқда" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Белгиланган фойдаланувчилар муваффақиятли ўчирилди." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Привилегиялар муваффақиятли қайта юкланди." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Привилегияларни таҳрирлаш" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Бекор қилиш" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Фойдаланувчилар ҳисобини кўриб чиқиш" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "GRANT" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Ҳар қайси" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Янги фойдаланувчи қўшиш" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Белгиланган фойдаланувчиларни ўчириш" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Фойдаланувчиларнинг барча фаол привилегияларини бекор қилиш, сўнг уларни " "ўчириш." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "Фойдаланувчилар номлари билан аталган маълумотлар базаларини ўчириш." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5325,98 +5009,98 @@ msgstr "" "маълумотлар сервер томонидан ишлатилаётган привилегиялардан фарқ қилиши " "мумкин. Бу ҳолда %sпривилегияларни қайта юклаш%s керак." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Белгиланган фойдаланувчи привилегиялар жадвалида топилмади." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Майдон привилегиялари" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Қуйидаги маълумотлар омборига привилегия қўшиш" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Маълумотлар базалари номларида пастки чизиқ (_) ва фоиз (%) белгилари " "ишлатилганда улар олдига тескари эгри чизиқ (\\) қўйиш керак." -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Қуйидаги жадвалга привилегия қўшиш" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Фойдаланувчининг логинини ўзгартириш / Фойдаланувчидан нусха олиш" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Худди шундай привилегияли янги фойдаланувчи киритиш..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr " ва эскисини сақлаш." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ва фойдаланувчилар жадвалидан эскисини ўчириш." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr ", эскисининг барча фаол привилегияларини бекор қилиб ўчириш." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" ", фойдаланувчилар жадвалидан эскисини ўчириб привилегияларни қайта юклаш." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Фойдаланувчи учун маълумотлар базаси" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Йўқ" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" "Фойдаланувчи номи билан аталган маълумотлар базаси тузиш ва унга тўлиқ " "привилегияларни бериш." -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" "(фойдаланувчи\\_%) шаблонига тўғри келадиган барча маълумотлар базаларига " "тўлиқ привилегияларни бериш." -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "\"%s\"" маълумотлар базасига барча привилегияларни бериш;" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "\"%s\"га рухсати бўлган фойдаланувчилар" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "Глобал" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "Маълумотлар базаси даражасида" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "Гуруҳлаш белгиси" @@ -8409,25 +8093,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "Киритилган қатор идентификатори: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "PHP-код сифатида кўрсатиш" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "SQL-сўровни кўрсатиш" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr " `\"%s\"` жадвалидаги индексларда муаммо мавжуд" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Хатчўп белгиси" @@ -8479,13 +8163,6 @@ msgstr "Янги қатор сифатида қўшиш ва хатоликла msgid "Show insert query" msgstr "Киритилган сўровни кўрсатиш" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "ва сўнг" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Олдинги саҳифага ўтиш" @@ -8565,7 +8242,7 @@ msgstr "(\"PRIMARY\" номи фақат бирламчи индексг msgid "Add to index  %s column(s)" msgstr " \"%s\" майдон(лар)ини индексга қўшиш" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Устунлар сони нолдан кўп бўлиши шарт." @@ -8679,41 +8356,6 @@ msgstr "Маълумотлар яхлитлигини текшириш:" msgid "Show tables" msgstr "Жадвалларни кўрсатиш" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Фойдаланилаётган жой" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Ишлатилиш" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Эффективлик" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Қаторлар статистикаси" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Тавсиф" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "статик" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "динамик" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Қатор узунлиги" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Фойдаланилаётган жой" @@ -8747,7 +8389,6 @@ msgid "Row length" msgstr "Қатор узунлиги" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "Қатор ҳажми" @@ -8825,50 +8466,50 @@ msgstr "Йўқ" msgid "Column %s has been dropped" msgstr "\"%s\" жадвали ўчирилди" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr " \"%s\" га бирламчи калит қўшилди" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr " \"%s\" учун индекс қўшилди" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Алоқаларни кўриш" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Жадвал тузилиши таҳлили" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add column(s)" msgid "Add column" msgstr "Устун(лар) қўшиш" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Жадвал охирига" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Жадвал бошига" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr " \"%s\" дан кейин" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "\"%s\" майдон учун индекс тузиш" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "бўлакларга бўлинган" @@ -8912,6 +8553,10 @@ msgstr "Агар керак бўлмаса, ушбу икки қатор олд msgid "SQL statements exported. Please copy the dump or execute it." msgstr "SQL сўрови экспорт қилинди. Дампдан нусха олинг ёки уни бажаринг." +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "Ёпиш" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -9362,6 +9007,9 @@ msgstr "Кўриниш номини ўзгартириш" #~ msgid "Process list" #~ msgstr "Жараёнлар рўйхати" +#~ msgid "Reload privileges" +#~ msgstr "Привилегияларни қайта юклаш" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/uz@latin.po b/po/uz@latin.po old mode 100755 new mode 100644 index 2ad3ae33e..7d4711775 --- a/po/uz@latin.po +++ b/po/uz@latin.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:20+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: uzbek_latin \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "Barchasini ko‘rsatish" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "Qidirish" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "OK" @@ -113,7 +93,7 @@ msgstr "Ushbu qiymatni ishlatish" msgid "Database %1$s has been created." msgstr " %1$s ma`lumotlar bazasi tuzildi." -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "Ma`lumotlar bazasiga izoh:" @@ -140,17 +120,10 @@ msgstr "Maydon nomlari" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "Tur" @@ -163,7 +136,7 @@ msgstr "Tur" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -187,24 +160,18 @@ msgstr "Aloqalar" msgid "Comments" msgstr "Izohlar" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "Yo‘q" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -213,15 +180,9 @@ msgstr "Yo‘q" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -240,141 +201,133 @@ msgstr "Ma`lumotlar bazasi dampini (sxemasini) namoyish etish" msgid "No tables found in database." msgstr "Ma`lumotlar bazasida bironta ham jadval mavjud emas." -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "Barchasini belgilash" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "Belgilashni bekor qilish" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "Ma`lumotlar bazasi nomi bo‘sh!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr " `\"%s\"` ma`lumotlar bazasining nomi `\"%s\"` deb o‘zgartirildi." -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "\"%s\" ma`lumotlar bazasidan \"%s\" ga nusxa ko‘chirildi." -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "Ma`lumotlar bazasi nomini quyidagiga o‘zgartirish" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "Buyruq" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "va so‘ng" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "Ma`lumotlar bazasidan quyidagiga nusxa olish" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "Faqat tuzilishi" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "Tuzilishi va ma`lumotlari" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "Faqat ma`lumotlar" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "Nusxa ko‘chirishdan oldin ma`lumotlar bazasi tuzing (CREATE DATABASE)" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "\"%s\" qo‘shish" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "AUTO_INCREMENT qo‘shish" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "Cheklovlar qo‘shish" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "Nusxa olingan ma`lumotlar bazasiga o‘tish" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "BLOB ombori" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "Holat" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "Faollashtirilgan" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "Faolsizlantirish" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "Shikastlangan" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy #| msgid "Repair" msgctxt "BLOB repository" msgid "Repair" msgstr "Tiklash" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "Faolsizlantirilgan" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "Faollantirish" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "Taqqoslash" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " @@ -383,14 +336,14 @@ msgstr "" "Aloqador jadvallar bilan ishlash uchun qo‘shimcha imkoniyatlar mavjud emas. " "Sabablarini aniqlash uchun %sbu yerga%s bosing." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "PDF-sahifalarni tahrirlash" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -399,11 +352,7 @@ msgstr "Jadval " #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "Qatorlarsoni" @@ -411,42 +360,30 @@ msgstr "Qatorlarsoni" msgid "Size" msgstr "Hajmi" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "ishlatilmoqda" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "Tuzish" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "Oxirgi yangilanish" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "Oxirgi tekshiruv" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -507,11 +444,7 @@ msgstr "O‘chirish" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "Yoki" @@ -545,86 +478,86 @@ msgstr "Jadvallarni ishlatish" msgid "SQL query on database %s:" msgstr "\"%s\" ma`lumotlar bazasiga SQL-so‘rov: " -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "so‘rovni bajarish" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "Ruxsat berilmadi" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "so‘zlardan biri" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "barcha so‘zlar" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "aniq moslik" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "muntazam ibora" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "\"\"%s\"\" uchun qidiruv natijalari \"%s\":" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "\"%s\" jadvalida o‘xshashliklar soni \"%s\" ta" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "Ko‘rib chiqish" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "O‘chirish" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "Jami: \"%s\" o‘xshashlik" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "Ma`lumotlar bazasida qidirish" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "" "Qidirish uchun so‘z(lar) yoki qiymat(lar) (o‘rniga qo‘yish belgisi: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "Izlash:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "So‘zlar bo‘sh joy (\" \") yordamida bo‘lingan." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "Quyidagi jadval(lar)da qidirish:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -632,36 +565,36 @@ msgstr "Quyidagi maydon(lar)da qidirish: " #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "Qo‘yish" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "Tuzilishi" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "O‘chirish" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "Tozalash" @@ -671,25 +604,25 @@ msgstr "Tozalash" msgid "Table %s has been emptied" msgstr "\"%s\" jadvali tozalandi" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr " \"%s\" namoyishi o‘chirildi" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "\"%s\" jadvali o‘chirildi" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "Kuzatish faol." -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "Kuzatish faol emas." -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" @@ -698,92 +631,86 @@ msgstr "" "Ushbu namoyish kamida ko‘rsatilgan miqdorda qatorlarga ega. Batafsil " "ma`lumot uchun %sdokumentatsiyaga%s qarang." -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "Namoyish" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "Replikatsiya (zaxira nusxa ko‘chirish)" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "Jami" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "\"%s\" - MySQL serveridagi andozaviy ma`lumotlar jadvali turi." -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "Belgilanganlarni: " -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "Barchasini belgilash" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "Belgilashni bekor qilish" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "Optimallashtirish lozim bo‘lgn jadvallarni belgilash" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "Chop etish versiyasi" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "Jadvalni tekshirish" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "Jadvalni optimallashtirish" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "Jadvalni tiklash" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "Jadval tahlili" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "Eksport" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "Ma`lumotlar lug‘ati" @@ -794,10 +721,10 @@ msgstr "Kuzatilgan jadvallar" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -817,8 +744,8 @@ msgstr "Yangilandi" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "Amal" @@ -852,8 +779,8 @@ msgstr "Tuzilma rasmi" msgid "Untracked tables" msgstr "Kuzatilmagan jadvallar" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "Jadvalni kuzatish" @@ -939,7 +866,7 @@ msgstr "Xatcho‘p o‘chirildi." msgid "Showing bookmark" msgstr "Xatcho‘plarni ko‘rsatish" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "\"%s\" xatcho‘pi tuzildi" @@ -1029,297 +956,188 @@ msgstr "Xost nomi bo‘sh!" msgid "The user name is empty!" msgstr "Foydalanuvchi nomi belgilanmagan!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "Parol belgilanmagan!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "Kiritilgan parollar bir xil emas!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "Yangi foydalanuvchi qo‘shish" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create version" -msgid "Create User" -msgstr "Vеrsiyasini tuzish" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reload privileges" -msgid "Reloading Privileges" -msgstr "Privilegiyalarni qayta yuklash" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "Belgilangan foydalanuvchilarni o‘chirish" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "Yopish" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "Bekor qilish" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "Yuklash" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "Jarayonlar" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "OK" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "Ma`lumotlar bazasi nomini quyidagiga o‘zgartirish" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "Ma`lumotlar bazasi" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "Ma`lumotlar bazasidan quyidagiga nusxa olish" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "Kodirovka" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "Jadvalda, hech bo‘lmaganda, bitta maydon bo‘lishi shart." - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "Jadval tuzish" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "Qidirish" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "O‘zgaririshlar saqlandi" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "Aloqa o‘chirildi" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "Tashqi kalitga (FOREIGN KEY) aloqa o‘rnatildi" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "Ichki aloqa o‘rnatildi" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "Xatolik: Bog‘liqlik o‘rnatilmadi." -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "Xatolik: Bog‘liqlik allaqachon mavjud." -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "Koordinatalarni saqlashda xatolik." -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "Aloqalarning asosiy imkoniyatlari" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "Faolsizlantirilgan" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "Bog‘liq kalitni tanlang" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "Tashqi kalitni tanlang" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" "Birlamchi (PRIMARY) yoki unikal (UNIQUE) indeks bo‘lgan maydonni tanlang!" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Ko‘rsatiladigan maydonni tanlash" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "Donate" msgid "Done" msgstr "Sadaqa" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Orqaga" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "Keyingi" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "Jami" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "Ikkilik" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Mar" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Apr" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "May" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Iyun" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Iyul" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Avg" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Okt" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Yanv" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Fev" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Apr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1327,178 +1145,178 @@ msgid "May" msgstr "May" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Iyun" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Iyul" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Avg" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Sen" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Okt" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Noya" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Dek" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Yaksh" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Dush" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Sesh" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Jum" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Yaksh" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Dush" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Sesh" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Chor" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Pay" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Jum" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Shan" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Yaksh" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Dush" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Sesh" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Chor" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Pay" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Jum" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Shan" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 #, fuzzy #| msgid "Wiki" msgid "Wk" msgstr "Viki" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "ishlatilmoqda" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1561,7 +1379,7 @@ msgstr "Indekslar" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "Unikal" @@ -1579,7 +1397,7 @@ msgid "Comment" msgstr "Izoh" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1602,8 +1420,8 @@ msgid "" "removed." msgstr " %1$s va %2$s indekslari bir xil, ulardan birini o‘chirish mumkin." -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "Ma`lumotlar bazalari" @@ -1773,11 +1591,7 @@ msgstr "Parol:" msgid "Server Choice" msgstr "Serverni tanlang" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Brauzerda \"cookies\" faollashtirilgan bo‘lishi shart." @@ -1863,11 +1677,7 @@ msgstr "" "yoki \"recode_string\" funksiyasini ishlatib bo‘lmadi. Ehtimol, PHP ni " "sozlashda xatolik mavjud." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
Agar bo‘m-bo‘sh sahifa " "ko‘rsatilsa, demak, hammasi joyida." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr " \"%1$s\" faylidan andoza konfiguratsiyani yuklab bo‘lmadi." -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" @@ -1905,52 +1707,32 @@ msgstr "" "$cfg[\"PmaAbsoluteUrl\"] direktivasi konfiguratsion faylda " "sozlanishi SHART!" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "Server raqami noto‘g‘ri: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" " %1$s serveri uchun noto‘g‘ri xost nomi ko‘rsatilgan. phpMyAdmin " "konfiguratsion faylida belgilangan sozlashlarni to‘g‘irlang." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "Server" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -======= #: libraries/common.inc.php:816 ->>>>>>> origin/master msgid "Invalid authentication method set in configuration:" msgstr "" "phpMyAdmin konfiguratsion faylida noto‘g‘ri autentifikatsiya usuli " "belgilangan:" -<<<<<<< HEAD -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr " \"%s\" ni \"%s\" versiyaga yoki kattaroq versiyaga yangilash zarur." @@ -1978,7 +1760,7 @@ msgstr "Yuborildi" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "Dokumentatsiya" @@ -1992,140 +1774,140 @@ msgstr "SQL so‘rovi" msgid "MySQL said: " msgstr "MySQL javobi: " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "So‘rov tahlili" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "Tahlil kerak emas" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "PHP-kod olib tashlash" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "PHP-kod" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "Yangilash" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "SQL sintaksisi tekshiruvini olib tashlash" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "SQL to‘g‘riligini tekshirish" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "Jadval turlari" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "Profillashtirish" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "Vaqt" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Bayt" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr " " #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "," #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%d %B %Y y., %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "\"%s\" kun, \"%s\" soat, \"%s\" minut va \"%s\" sekund" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "Boshi" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "Orqaga" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "Oxiri" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr " \"%s\" ma`lumotlar bazasiga o‘tish" -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" " \"%s\" parametrining ishi ma`lum xatolikka olib kelishi mumkin, batafsil " "ma`lumot uchun qarang \"%s\"" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2146,7 +1928,7 @@ msgid "Events" msgstr "Hodisalar" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "Nomi" @@ -2174,15 +1956,15 @@ msgstr "So‘rov" msgid "Designer" msgstr "Dizayner" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "Import" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "Privilegiyalar" @@ -2203,11 +1985,7 @@ msgstr "" "\"FAQ 3.11\"[/a]ga qarang" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "Fragmentlangan" @@ -2226,7 +2004,7 @@ msgstr "Server javob bermayapti" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(yoki lokal MySQL serverning soketi noto‘g‘ri sozlangan)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "Tafsilotlar..." @@ -2236,36 +2014,22 @@ msgid "Change password" msgstr "Parolni o‘zgartirish" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "Parol yo‘q" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "Parol" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "Tasdiqlash" @@ -2280,20 +2044,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 ga mos" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "Parol o‘rnatish" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "Generatsiya qilish" @@ -2306,17 +2062,23 @@ msgstr "Yangi ma`lumotlar bazasi tuzish" msgid "Create" msgstr "Tuzish" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "Privilegiyalar yo‘q" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "Jadvalda, hech bo‘lmaganda, bitta maydon bo‘lishi shart." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "\"%s\" ma`lumotlar bazasida yangi jadval tuzish" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2383,11 +2145,7 @@ msgid "remember template" msgstr " shablonni yodda tutish" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "Fayl kodirovkasi: " @@ -2398,7 +2156,7 @@ msgstr "Siqish" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "Yo‘q" @@ -2445,11 +2203,7 @@ msgstr "" msgid "File to import" msgstr "Import qilinayotgan fayl " -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "Faylni tanlash" @@ -2457,20 +2211,12 @@ msgstr "Faylni tanlash" msgid "File uploads are not allowed on this server." msgstr "Fayllarni serverga yuklab bo‘lmadi." -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "Ko‘rsatilgan katalokka yuklab bo‘lmadi" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "Yuklash katalogidan" @@ -2610,11 +2356,7 @@ msgstr "Indeks bo‘yicha sortirovka qilish" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "Parametrlar" @@ -2684,14 +2426,14 @@ msgstr "Yozuvlarni ko‘rsatish" msgid "total" msgstr "jami" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "So‘rov %01.4f sekund vaqt oldi" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "O‘zgartirish" @@ -2762,11 +2504,7 @@ msgstr "Ishlatilish" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "Jami" @@ -3056,11 +2794,7 @@ msgstr "" "tartibda raqamlanadi." #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "Format" @@ -3134,13 +2868,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "Ma`lumotlar" @@ -3189,15 +2918,9 @@ msgstr "MIME turi" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "Xost" @@ -3393,7 +3116,7 @@ msgstr "Tarkibini eksport qilish" msgid "Open new phpMyAdmin window" msgstr "phpMyAdmin dasturini yangi oynada ochish" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "Yangi jadval" @@ -3405,7 +3128,7 @@ msgstr "SQL so‘rovi natijasi" msgid "Generated by" msgstr "Tuzilgan" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL bo‘sh natija berdi (ya`ni nolta satr)." @@ -3561,20 +3284,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "Birlamchi" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "Indeks" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "Matn to‘laligicha" @@ -3799,6 +3522,10 @@ msgstr "Ushbu format uchun sozlanadigan parametr mavjud emas" msgid "not OK" msgstr "Tayyor emas" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "OK" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "Faollashtirilgan" @@ -3822,7 +3549,7 @@ msgstr "" "\"column_comments\" jadvalini yangilash zarur. Batafsil ma`lumot uchun " "dokumentatsiyaga qarang." -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "Xatcho‘p qo‘yilgan SQL so‘rovi" @@ -3883,13 +3610,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "Foydalanuvchi nomi" @@ -3906,22 +3628,14 @@ msgstr "Bosh rеplikatsiya sеrvеri statusi" msgid "Slave status" msgstr "Tobе rеplikatsiya sеrvеri statusi" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "O‘zgaruvchi" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "Qiymati" @@ -3941,40 +3655,11 @@ msgstr "" msgid "Add slave replication user" msgstr "Tobе rеplikatsiya foydalanuvchisini qo‘shish" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "Har qaysi foydalanuvchi" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "Matnmaydonini ishlatish" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "Har qaysi xost" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "Lokal" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "Ushbu xost" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "Xostlar jadvalidan foydalanish" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3998,7 +3683,6 @@ msgid "Use Host Table" msgstr "Xostlar jadvalidan foydalanish" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -4034,29 +3718,29 @@ msgstr "Noma`lum til: %1$s." msgid "Servers" msgstr "Serverlar" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "O‘zgaruvchilar" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "Kodirovkalar" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "Jadval turlari" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "Ikkilik jurnal" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "Jarayonlar" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "Sinxronizatsiya qilish" @@ -4083,51 +3767,51 @@ msgstr "Farq" msgid "Target database" msgstr "Nishon baza" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "\"%s\" serverida SQL-so‘rov(lar)ni bajarish " -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "\"%s\" ma`lumotlar bazasida SQL-so‘rov(lar)ni bajarish" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "Maydon nomlari" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "Ushbu SQL so‘roviga xatcho‘p tuzish" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "Barcha foydalanuvchilarga ruxsat berish" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "Shu nomli xatcho‘pni almashtirish" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "So‘rovlar oynasi ichidagi ma`lumotlarni blokirovka qilish" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "Taqsimlovchi" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr "Ushbu so‘rovni qayta ko‘rsatish" -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "Bajarish" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "Faqat ko‘rish" @@ -4306,13 +3990,13 @@ msgstr "Bo‘laklarni (PARTITIONS) belgilash" msgid "Save" msgstr "Saqlash" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add column(s)" msgid "Add %s column(s)" msgstr "Ustun(lar) qo‘shish" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4532,8 +4216,8 @@ msgstr "Tozalash" msgid "Protocol version" msgstr "Protokol versiyasi" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "Foydalanuvchi" @@ -5000,117 +4684,117 @@ msgstr "Jadval turlari" msgid "View dump (schema) of databases" msgstr "Ma`lumotlar bazalari dampini (sxemasini) namoyish etish" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "GRANT dan tashqari barcha privilegiyalarni o‘z ichiga oladi" -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "Mavjud jadvallarning tuzilishini o‘zgartirishga ruxsat beradi" -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "Saqlanadigan muolajalarni o‘zgartirish va o‘chirishga ruxsat beradi" -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "Yangi ma`lumotlar bazalari va jadvallar tuzishga ruxsat beradi" -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "Saqlanadigan muolajalar tuzishga ruxsat beradi" -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "Yangi jadvallar tuzishga ruxsat beradi" -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "Vaqtinchalik jadvallar tuzishga ruxsat beradi" -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "" "Foydalanuvchilar hisobini qo‘shish, o‘chirish va o‘zgartirishga ruxsat beradi" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "Yangi namoyishlar tuzish(CREATE VIEW)ga ruxsat beradi" -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "Ma`lumotlarni o‘chirishga ruxsat beradi" -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "Ma`lumotlar bazalarini va jadvallarni o‘chirishga ruxsat beradi" -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "Jadvallarni o‘chirishga rux`sat beradi" -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "Kechiktirilgan hodisalarni sozlashga ruxsat beradi" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "Saqlanadigan muolajalarni bajarishga ruxsat beradi" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "Ma`lumotlarni fayldan import va faylga eksport qilishga ruxsat beradi" -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Foydalanuvchilarni qo‘shish va privilegiyalar jadvalini qayta yuklamasdan " "privilegiyalar qo‘shishga ruxsat beradi" -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "Indekslar qo‘shish va ularni o‘chirishga ruxsat beradi" -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "Ma`lumot qo‘yish va o‘zgartirishga ruxsat beradi" -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "Joriy oqim uchun jadvalni blokirovku qilishga ruxsat beradi" -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Foydalanuvchi bir soat davomida o‘rnatishi mumkin bo‘lgan yangi ulanishlar " "soni" -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Foydalanuvchi bir soat davomida yuborishi mumkin bo‘lgan so‘rovlar soni" -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." @@ -5118,65 +4802,65 @@ msgstr "" "Foydalanuvchi bir soat davomida bajarishi mumkin bo‘lgan biron-bir jadval " "yoki ma`lumotlar bazasini o‘zgartiradigan buyruqlar soni" -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "" "Bir foydalanuvchi tomonidan bir vaqtning o‘zida o‘rnatishi mumkin bo‘lgan " "ulanishlar soni" -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "Barcha foydalanuvchilarning jarayonlarini ko‘rishga ruxsat beradi" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "MySQL-serverning ushbu versiyada bunday xususiyat mavjud emas!" -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "" "Server sozlanishlarini qayta yuklashga va uning keshlarini tozalashga ruxsat " "beradi" -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "" "Bosh va tobe serverlarning joylashishi haqidagi ma`lumotni talab qilishga " "ruxsat beradi" -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "" "Replikatsiya (zaxira nusxa ko‘chirish) vaqtida tobe serverlar uchun kerak" -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "Ma`lumotlarni chaqirishga ruxsat beradi" -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "Ma`lumotlar bazalarining to‘liq ro‘yxatiga ruxsat beradi" -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "Namoyish tuzadigan so‘rov(SHOW CREATE VIEW)ni bajarishga ruxsat beradi" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "Server ishini yakunlashga ruxsat beradi" -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -5187,163 +4871,163 @@ msgstr "" "global o‘zgaruvchilar o‘rnatish yoki boshqa foydalanuvchi jarayonini " "o‘chirish)" -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "" "Triggerlar (ma`lum shartlar bajarilganda avtomatik ishga tushadigan " "jarayonlar) tuzish va ularni o‘chirishga ruxsat beradi" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "Ma`lumotlarni o‘zgartirishga ruxsat beradi" -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "Privilegiyalar yo‘q" -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "Yo‘q" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "Jadval darajasijagi privilegiyalar" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr "IZOH: MySQL privilegiyalari turlari ingliz tilida ko‘rsatiladi." -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "Global privilegiyalar" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "Ma`lumotlar bazasi privilegiyalari" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "Administratsiya" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "Resurslardan foydalanishni cheklash" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "" "IZOH: parametr qiymatlarini 0 (nol) deb belgilash mavjud cheklashlarni bekor " "qiladi." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "Foydalanuvchi hisobi haqida ma`lumot" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "Parolni o‘zgartirmaslik" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "Bironta ham foydalanuvchi topilmadi." -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr " \"%s\" nomli foydalanuvchi mavjud!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "Siz yangi foydalanuvchi qo‘shdingiz." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr " \"%s\" uchun privilegiyalar o‘zgartirildi." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr " \"%s\" foydalanuvchining privilegiyalari bekor qilindi." -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "\"%s\" foydalanuvchining paroli muvaffaqiyatli o‘zgartirildi." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "\"%s\" o‘chirilmoqda" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "O‘chirish lozim bo‘lgan foydalanuvchilar tanlanmagan!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "Privilegiyalar qayta yuklanmoqda" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "Belgilangan foydalanuvchilar muvaffaqiyatli o‘chirildi." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "Privilegiyalar muvaffaqiyatli qayta yuklandi." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "Privilegiyalarni tahrirlash" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "Bekor qilish" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "Foydalanuvchilar hisobini ko‘rib chiqish" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "GRANT" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "Har qaysi" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "Yangi foydalanuvchi qo‘shish" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "Belgilangan foydalanuvchilarni o‘chirish" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "" "Foydalanuvchilarning barcha faol privilegiyalarini bekor qilish, so‘ng " "ularni o‘chirish." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "" "Foydalanuvchilar nomlari bilan atalgan ma`lumotlar bazalarini o‘chirish." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5356,50 +5040,50 @@ msgstr "" "ma`lumotlar server tomonidan ishlatilayotgan privilegiyalardan farq qilishi " "mumkin. Bu holda %sprivilegiyalarni qayta yuklash%s kerak." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "Belgilangan foydalanuvchi privilegiyalar jadvalida topilmadi." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "Maydon privilegiyalari" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "Quyidagi ma`lumotlar omboriga privilegiya qo‘shish" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" "Ma`lumotlar bazalari nomlarida pastki chiziq (_) va foiz (%) belgilari " "ishlatilganda ular oldiga teskari egri chiziq (\\) qo‘yish kerak." -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "Quyidagi jadvalga privilegiya qo‘shish" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "Foydalanuvchining loginini o‘zgartirish / Foydalanuvchidan nusxa olish" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "Xuddi shunday privilegiyali yangi foydalanuvchi kiritish..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr " va eskisini saqlash." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " va foydalanuvchilar jadvalidan eskisini o‘chirish." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr ", eskisining barcha faol privilegiyalarini bekor qilib o‘chirish." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." @@ -5407,48 +5091,48 @@ msgstr "" ", foydalanuvchilar jadvalidan eskisini o‘chirib privilegiyalarni qayta " "yuklash." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "Foydalanuvchi uchun ma`lumotlar bazasi" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "Yo‘q" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" "Foydalanuvchi nomi bilan atalgan ma`lumotlar bazasi tuzish va unga to‘liq " "privilegiyalarni berish." -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" "(foydalanuvchi\\_%) shabloniga to‘g‘ri keladigan barcha ma`lumotlar " "bazalariga to‘liq privilegiyalarni berish." -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "\"%s\"" ma`lumotlar bazasiga barcha privilegiyalarni berish;" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "\"%s\"ga ruxsati bo‘lgan foydalanuvchilar" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "Global" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "Ma`lumotlar bazasi darajasida" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "Guruhlash belgisi" @@ -8471,25 +8155,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "Kiritilgan qator identifikatori: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "PHP-kod sifatida ko‘rsatish" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "SQL-so‘rovni ko‘rsatish" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr " `\"%s\"` jadvalidagi indekslarda muammo mavjud" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "Xatcho‘p belgisi" @@ -8541,13 +8225,6 @@ msgstr "Yangi qator sifatida qo‘shish va xatoliklarga e’tibor bеrmaslik" msgid "Show insert query" msgstr "Kiritilgan so‘rovni ko‘rsatish" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "va so‘ng" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "Oldingi sahifaga o‘tish" @@ -8628,7 +8305,7 @@ msgstr "(\"PRIMARY\" nomi faqat birlamchi indeksgaega bo‘lishi shart!)" msgid "Add to index  %s column(s)" msgstr " \"%s\" maydon(lar)ini indeksga qo‘shish" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "Ustunlar soni noldan ko‘p bo‘lishi shart." @@ -8742,41 +8419,6 @@ msgstr "Ma`lumotlar yaxlitligini tekshirish:" msgid "Show tables" msgstr "Jadvallarni ko‘rsatish" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "Foydalanilayotgan joy" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "Ishlatilish" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "Effektivlik" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "Qatorlar statistikasi" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "Tavsif" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "statik" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "dinamik" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "Qator uzunligi" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "Foydalanilayotgan joy" @@ -8810,7 +8452,6 @@ msgid "Row length" msgstr "Qator uzunligi" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "Qator hajmi" @@ -8889,50 +8530,50 @@ msgstr "Yo‘q" msgid "Column %s has been dropped" msgstr "\"%s\" jadvali o‘chirildi" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr " \"%s\" ga birlamchi kalit qo‘shildi" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr " \"%s\" uchun indeks qo‘shildi" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "Aloqalarni ko‘rish" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "Jadval tuzilishi tahlili" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add column(s)" msgid "Add column" msgstr "Ustun(lar) qo‘shish" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "Jadval oxiriga" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "Jadval boshiga" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr " \"%s\" dan keyin" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "\"%s\" maydon uchun indeks tuzish" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "bo‘laklarga bo‘lingan" @@ -8976,6 +8617,10 @@ msgstr "Agar kеrak bo‘lmasa, ushbu ikki qator oldiga sharh bеlgisini qo‘yi msgid "SQL statements exported. Please copy the dump or execute it." msgstr "SQL so‘rovi eksport qilindi. Dampdan nusxa oling yoki uni bajaring." +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "Yopish" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -9431,6 +9076,9 @@ msgstr "Ko‘rinish nomini o‘zgartirish" #~ msgid "Process list" #~ msgstr "Jarayonlar ro‘yxati" +#~ msgid "Reload privileges" +#~ msgstr "Privilegiyalarni qayta yuklash" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded." diff --git a/po/zh_CN.po b/po/zh_CN.po old mode 100755 new mode 100644 index fb0d7304e..c6236ee9b --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-06-04 14:09+0200\n" "Last-Translator: shanyan baishui \n" "Language-Team: chinese_simplified \n" @@ -19,11 +15,11 @@ msgstr "" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "全部显示" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -41,53 +37,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "搜索" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "执行" @@ -113,7 +93,7 @@ msgstr "使用此值" msgid "Database %1$s has been created." msgstr "创建数据库 %1$s 成功。" -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "数据库注释：" @@ -138,17 +118,10 @@ msgstr "字段" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "类型" @@ -161,7 +134,7 @@ msgstr "类型" msgid "Null" msgstr "空" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -185,24 +158,18 @@ msgstr "链接到" msgid "Comments" msgstr "注释" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr "否" -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -211,15 +178,9 @@ msgstr "否" #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -238,149 +199,141 @@ msgstr "查看数据库的转存(大纲)。" msgid "No tables found in database." msgstr "数据库中没有表。" -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "全选" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "全不选" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "数据库名不能为空！" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "已将数据库 %s 改名为 %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "已将数据库 %s 复制为 %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "将数据库改名为" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "命令" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "然后" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "复制数据库到" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "仅结构" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "结构和数据" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "仅数据" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "复制前创建数据库 (CREATE DATABASE)" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "添加 %s" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "添加自增 (AUTO_INCREMENT) 值" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "强制添加" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "切换到复制的数据库" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "BLOB 容器" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "状态" -#: db_operations.php:559 +#: db_operations.php:548 msgctxt "BLOB repository" msgid "Enabled" msgstr "已启用" -#: db_operations.php:563 +#: db_operations.php:552 msgid "Disable" msgstr "禁用" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "已损坏" -#: db_operations.php:577 +#: db_operations.php:566 msgctxt "BLOB repository" msgid "Repair" msgstr "修复" -#: db_operations.php:585 +#: db_operations.php:574 msgctxt "BLOB repository" msgid "Disabled" msgstr "已禁用" -#: db_operations.php:589 +#: db_operations.php:578 msgid "Enable" msgstr "启用" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "整理" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " "deactivated. To find out why click %shere%s." msgstr "链接表的附加功能尚未激活。要查出原因，请点击%s此处%s。" -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "编辑 PDF 页" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -389,11 +342,7 @@ msgstr "表" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "行数" @@ -401,42 +350,30 @@ msgstr "行数" msgid "Size" msgstr "大小" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "使用中" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "创建时间" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "最后更新" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "最后检查" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, php-format msgid "%s table" msgid_plural "%s tables" @@ -495,11 +432,7 @@ msgstr "删除" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "或" @@ -531,85 +464,85 @@ msgstr "使用表" msgid "SQL query on database %s:" msgstr "在数据库 %s 执行 SQL 语句：" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "提交查询" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "拒绝访问" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "至少一个词" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "所有词" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "精确短语" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "使用正则表达式" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "“%s”的搜索结果 %s：" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s 个匹配 - 于表 %s 中" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "浏览" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "删除" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "总计： %s 个匹配" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "在数据库中搜索" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "要查找的文字或数值 (通配符：“%”)：" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "查找：" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "每个单词用空格 (“ ”) 分隔。" -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "于以下表：" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside field:" msgid "Inside column:" @@ -617,36 +550,36 @@ msgstr "包含字段：" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "插入" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "结构" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "删除" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "清空" @@ -656,117 +589,111 @@ msgstr "清空" msgid "Table %s has been emptied" msgstr "已清空表 %s " -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "已删除视图 %s" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "已删除表 %s " -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "追踪已启用。" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "追踪已禁用。" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "该视图最少包含的行数，参见%s文档%s。" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "视图" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "复制" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "总计" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "%s 是此 MySQL 服务器的默认存储引擎。" -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "选中项：" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "全选" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "全不选" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "仅选择多余" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "打印预览" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "检查表" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "优化表" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "修复表" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "分析表" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "导出" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "数据字典" @@ -777,10 +704,10 @@ msgstr "已追踪的表" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -800,8 +727,8 @@ msgstr "更新" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "操作" @@ -835,8 +762,8 @@ msgstr "结构快照" msgid "Untracked tables" msgstr "未追踪的表" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 msgid "Track table" msgstr "追踪表" @@ -912,7 +839,7 @@ msgstr "书签已删除。" msgid "Showing bookmark" msgstr "显示书签" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "已创建书签 %s" @@ -993,425 +920,316 @@ msgstr "主机名不能为空！" msgid "The user name is empty!" msgstr "用户名不能为空！" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "密码不能为空！" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "两次密码不一致！" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "添加新用户" - -#: js/messages.php:47 -#, fuzzy -#| msgid "Create version" -msgid "Create User" -msgstr "创建版本" - -#: js/messages.php:48 -#, fuzzy -#| msgid "Reloading the privileges" -msgid "Reloading Privileges" -msgstr "重新载入权限" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "删除选中的用户" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "关闭" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "取消" -#: js/messages.php:57 -#, fuzzy -#| msgid "Load" -msgid "Loading" -msgstr "加载" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "进程" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "确定" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "将数据库改名为" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "数据库" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "复制数据库到" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "字符集" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one column." -msgid "Table must have atleast 1 column" -msgstr "数据表至少要有一个字段。" - -#: js/messages.php:70 -#, fuzzy -#| msgid "Create table" -msgid "Create Table" -msgstr "新建数据表" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "搜索" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "已保存修改。" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 msgid "Relation deleted" msgstr "已删除关系" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "已添加外键关联" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 msgid "Internal relation added" msgstr "已添加内联关系" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "错误：关系未添加" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "错误：关系已存在" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "保存设计器坐标时出错。" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "基本功能" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "已禁用" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "选择外键" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "选择外键" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "请选择主键或唯一键" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 msgid "Choose column to display" msgstr "选择要显示的字段" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 msgid "Done" msgstr "完成" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 msgid "Prev" msgstr "上个月" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "下个月" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 msgid "Today" msgstr "今天" -#: js/messages.php:111 +#: js/messages.php:82 msgid "January" msgstr "一月" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "二月" -#: js/messages.php:113 +#: js/messages.php:84 msgid "March" msgstr "三月" -#: js/messages.php:114 +#: js/messages.php:85 msgid "April" msgstr "四月" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "五月" -#: js/messages.php:116 +#: js/messages.php:87 msgid "June" msgstr "六月" -#: js/messages.php:117 +#: js/messages.php:88 msgid "July" msgstr "七月" -#: js/messages.php:118 +#: js/messages.php:89 msgid "August" msgstr "八月" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "九月" -#: js/messages.php:120 +#: js/messages.php:91 msgid "October" msgstr "十月" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "十一月" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "十二月" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "一月" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "二月" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "三月" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "四月" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 msgctxt "Short month name" msgid "May" msgstr "五月" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "六月" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "七月" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "八月" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "九月" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "十月" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "十一月" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "十二月" -#: js/messages.php:151 +#: js/messages.php:122 msgid "Sunday" msgstr "星期日" -#: js/messages.php:152 +#: js/messages.php:123 msgid "Monday" msgstr "星期一" -#: js/messages.php:153 +#: js/messages.php:124 msgid "Tuesday" msgstr "星期二" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "星期三" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "星期四" -#: js/messages.php:156 +#: js/messages.php:127 msgid "Friday" msgstr "星期五" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "星期六" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "周日" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "周一" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "周二" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "周三" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "周四" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "周五" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "周六" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 msgid "Su" msgstr "日" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 msgid "Mo" msgstr "一" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 msgid "Tu" msgstr "二" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 msgid "We" msgstr "三" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 msgid "Th" msgstr "四" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 msgid "Fr" msgstr "五" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 msgid "Sa" msgstr "六" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "周" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "时" -#: js/messages.php:194 +#: js/messages.php:165 msgid "Minute" msgstr "分" -#: js/messages.php:195 +#: js/messages.php:166 msgid "Second" msgstr "秒" @@ -1468,7 +1286,7 @@ msgstr "索引" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "唯一" @@ -1486,7 +1304,7 @@ msgid "Comment" msgstr "注释" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1509,8 +1327,8 @@ msgid "" "removed." msgstr "索引 %1$s 和 %2$s 可能是相同的，其中一个将可能被删除" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "数据库" @@ -1672,11 +1490,7 @@ msgstr "密码：" msgid "Server Choice" msgstr "选择服务器" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "必须启用 Cookies 才能登录。" @@ -1755,11 +1569,7 @@ msgstr "" "虽然必须的扩展已经加载，但还是无法使用 iconv、libiconv 和 recode_string 函" "数。请检查您的 PHP 配置。" -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
如果您看到的是一个空白页，则代表没" "有任何问题。" -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, php-format msgid "Could not load default configuration from: %1$s" msgstr "无法加载默认配置: %1$s" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" msgstr "必须在您的配置文件中设置 $cfg['PmaAbsoluteUri'] ！" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, php-format msgid "Invalid server index: %s" msgstr "无效的服务器索引: %s" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "无效的主机名 %1$s，请检查配置文件。" -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "服务器" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "配置文件中设置的认证方式无效：" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "配置文件中设置的认证方式无效：" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "您应升级到 %s %s 或更高版本。" @@ -1858,7 +1640,7 @@ msgstr "zh" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "文档" @@ -1872,136 +1654,136 @@ msgstr "SQL 查询" msgid "MySQL said: " msgstr "MySQL 返回：" -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "解释 SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "略过解释 SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "无 PHP 代码" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "创建 PHP 代码" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "刷新" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "略过校验 SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "校验 SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "在本页面编辑此查询" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 msgid "Inline" msgstr "内联" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "概要" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "时间" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "字节" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%Y 年 %m 月 %d 日 %H:%M" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s 天 %s 小时，%s 分 %s 秒" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "开始" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "上一个" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "结束" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "跳转到数据库“%s”。" -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "%s 功能受到一个已知的缺陷 (bug) 影响，参见 %s" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2022,7 +1804,7 @@ msgid "Events" msgstr "事件" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "名字" @@ -2050,15 +1832,15 @@ msgstr "查询" msgid "Designer" msgstr "设计器" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "导入" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "权限" @@ -2078,11 +1860,7 @@ msgstr "" "可能接近。参见 [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "多余" @@ -2099,7 +1877,7 @@ msgstr "服务器没有响应" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(或者本地 MySQL 服务器的套接字没有正确配置)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "详细..." @@ -2109,36 +1887,22 @@ msgid "Change password" msgstr "修改密码" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "无密码" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "密码" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "重新输入" @@ -2151,20 +1915,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 兼容" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "生成密码" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "生成" @@ -2177,17 +1933,21 @@ msgstr "新建数据库" msgid "Create" msgstr "创建" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "无权限" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +msgid "Table must have at least one column." +msgstr "数据表至少要有一个字段。" + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "在数据库 %s 中新建一张数据表" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 msgid "Number of columns" msgstr "字段数" @@ -2248,11 +2008,7 @@ msgid "remember template" msgstr "记住模板" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "文件的字符集：" @@ -2263,7 +2019,7 @@ msgstr "压缩" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "无" @@ -2307,11 +2063,7 @@ msgstr "正在上传，没有详细信息，请稍候。" msgid "File to import" msgstr "要导入的文件" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "文本文件的位置" @@ -2319,20 +2071,12 @@ msgstr "文本文件的位置" msgid "File uploads are not allowed on this server." msgstr "此服务器禁止了文件上传。" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "用于上传的文件夹出错，无法使用" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "网站服务器上传文件夹" @@ -2461,11 +2205,7 @@ msgstr "主键排序" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master msgid "Options" msgstr "选项" @@ -2533,14 +2273,14 @@ msgstr "显示行" msgid "total" msgstr "总计" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "查询花费 %01.4f 秒" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "修改" @@ -2606,11 +2346,7 @@ msgstr "缓冲池使用情况" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "总计" @@ -2874,11 +2610,7 @@ msgstr "" "被删除，或者被以升序数字序列重命名。" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "格式" @@ -2942,13 +2674,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "数据" @@ -2997,15 +2724,9 @@ msgstr "MIME 类型" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "主机" @@ -3198,7 +2919,7 @@ msgstr "导出内容" msgid "Open new phpMyAdmin window" msgstr "打开新 phpMyAdmin 窗口" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 msgid "New table" msgstr "新数据表" @@ -3210,7 +2931,7 @@ msgstr "SQL 查询结果" msgid "Generated by" msgstr "生成者" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL 返回的查询结果为空 (即零行)。" @@ -3353,20 +3074,20 @@ msgstr "转换为假名" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "主键" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "索引" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "全文搜索" @@ -3591,6 +3312,10 @@ msgstr "此格式没有选项" msgid "not OK" msgstr "错误" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "确定" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "已启用" @@ -3612,7 +3337,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "请参见文档中关于如何更新您的 column_comments 表" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "SQL 查询书签" @@ -3667,13 +3392,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "用户名" @@ -3690,22 +3410,14 @@ msgstr "主服务器状态" msgid "Slave status" msgstr "从服务器状态" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "变量" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "值" @@ -3723,40 +3435,11 @@ msgstr "仅通过 --report-host=主机名 参数启动的从服务器可见。" msgid "Add slave replication user" msgstr "添加从复制用户" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "任意用户" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "使用文本域" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "任意主机" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "本地" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "此主机" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "使用主机表" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3780,7 +3463,6 @@ msgid "Use Host Table" msgstr "使用主机表" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3814,29 +3496,29 @@ msgstr "未知的语言：%1$s." msgid "Servers" msgstr "服务器" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "变量" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "字符集" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "引擎" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "二进制日志" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "进程" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "同步" @@ -3863,49 +3545,49 @@ msgstr "差异" msgid "Target database" msgstr "目标数据库" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "在服务器 %s 运行 SQL 查询" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "在数据库 %s 运行 SQL 查询" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 msgid "Columns" msgstr "字段" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "将此 SQL 查询加为书签" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "让所有用户均可访问此书签" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "替换现有的同名书签" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "不从窗口外覆盖此查询" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "语句定界符" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr " 在此再次显示此查询 " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "提交" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "仅查看" @@ -4060,12 +3742,12 @@ msgstr "分区定义" msgid "Save" msgstr "保存" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, php-format msgid "Add %s column(s)" msgstr "添加 %s 个字段" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 msgid "You have to add at least one column." msgstr "至少要添加一个字段。" @@ -4230,8 +3912,8 @@ msgstr "重置" msgid "Protocol version" msgstr "协议版本" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "用户" @@ -4670,168 +4352,168 @@ msgstr "存储引擎" msgid "View dump (schema) of databases" msgstr "查看数据库的转存(大纲)" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "除了授权 (GRANT) 以外的所有权限。" -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "允许修改现有数据表的结构。" -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "允许修改或删除储存过程。" -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "允许创建新数据库和数据表。" -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "允许创建存储过程。" -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "允许创建新数据表。" -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "允许创建临时表。" -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "允许创建、删除和重命名用户账户。" -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "允许创建视图。" -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "允许删除数据。" -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "允许删除数据库和数据表。" -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "允许删除数据表。" -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "允许为事件触发器设置事件" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "允许运行存储过程。" -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "允许从文件中导入数据以及将数据导出至文件。" -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "允许添加用户和权限，而不允许重新载入权限表。" -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "允许创建和删除索引。" -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "允许插入和替换数据。" -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "允许锁定当前线程的表。" -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "限制用户每小时打开的新连接数。" -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "限制用户每小时可发送到服务器的查询数。" -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." msgstr "限制用户每小时可执行的修改任何数据表或数据库的命令数。" -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "限制该用户的并发连接数。" -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "允许查看所有用户的进程" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "在此版本的 MySQL 中无效。" -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "允许重新载入服务器设置并刷新服务器的缓存。" -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "用户有权询问附属者/控制者在哪里。" -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "回复附属者所需。" -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "允许读取数据。" -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "允许访问完整的数据库列表。" -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "允许执行 SHOW CREATE VIEW 查询。" -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "允许关闭服务器。" -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -4840,152 +4522,152 @@ msgstr "" "允许在达到最大连接数时连接，对于大多数像设置全局变量或杀死其它用户线程这样的" "管理操作是必需的。" -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 msgid "Allows creating and dropping triggers" msgstr "允许创建和删除触发器" -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "允许修改数据。" -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "无权限。" -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 msgctxt "None privileges" msgid "None" msgstr "无" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "按表指定权限" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr " 注意：MySQL 权限名称会以英文显示 " -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "全局权限" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "按数据库指定权限" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "管理" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "资源限制" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "注意：若将这些选项设为 0(零) 即不限制。" -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "登录信息" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "保持原密码" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 msgid "No user found." msgstr "未找到用户。" -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "用户 %s 己存在！" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "您已添加了一个新用户。" -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "您已更新了 %s 的权限。" -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "您已撤销 %s 的权限" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "%s 的密码已修改。" -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "正在删除 %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "没有选择要删除的用户！" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "重新载入权限" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "已成功删除选中的用户。" -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "已成功重新载入权限。" -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "编辑权限" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "撤销" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "查看用户" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "授权" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "任意" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "添加新用户" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "删除选中的用户" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "撤销用户所有权限，然后删除用户。" -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "删除与用户同名的数据库。" -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -4997,89 +4679,89 @@ msgstr "" "将可能与服务器使用的用户权限有异。在这种情况下，您应在继续前%s重新载入权限%" "s。" -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "在权限表内找不到选中的用户。" -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "按字段指定权限" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "在下列数据库添加权限" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "要使用通配符 _ 和 % 本身，应使用用 \\ 转义" -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "在下列数据表添加权限" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "修改登录信息/复制用户" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "创建具有相同权限的新用户然后 ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... 保留旧用户。" -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... 从用户表中删除旧用户。" -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... 撤销旧用户的所有权限，然后删除旧用户。" -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr " ... 从用户表中删除旧用户，然后重新载入权限。" -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "用户数据库" -#: server_privileges.php:2060 +#: server_privileges.php:2037 msgctxt "Create none database for user" msgid "None" msgstr "无" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "创建与用户同名的数据库并授予所有权限" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "给以 用户名_ 开头的数据库 (username\\_%) 授予所有权限" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, php-format msgid "Grant all privileges on database "%s"" msgstr "授予数据库“%s”的所有权限。" -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "用户可以访问“%s”" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "全局" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "按数据库指定" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "通配符" @@ -7813,25 +7495,25 @@ msgstr "" msgid "ZIP" msgstr "ZIP" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "插入的行 id: %1$d" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "显示为 PHP 代码" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "显示 SQL 查询" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "数据表 `%s` 的索引存在问题" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "标签" @@ -7881,13 +7563,6 @@ msgstr "以新行插入 (忽略错误)" msgid "Show insert query" msgstr "显示插入语句" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "然后" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "返回上一页" @@ -7966,7 +7641,7 @@ msgstr "(“PRIMARY”必须而且只能作为主键的名称！)" msgid "Add to index  %s column(s)" msgstr "添加 %s 个索引字段" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "至少要有一个字段。" @@ -8078,41 +7753,6 @@ msgstr "检查引用完整性：" msgid "Show tables" msgstr "显示表" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "已用空间" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "已用" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "有效" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "行统计" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "说明" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "静态" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "动态" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "行长度" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "已用空间" @@ -8146,7 +7786,6 @@ msgid "Row length" msgstr "行长度" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr " 行大小 " @@ -8211,49 +7850,49 @@ msgstr "无" msgid "Column %s has been dropped" msgstr "已删除字段 %s " -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "已将 %s 设为主键" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "已将 %s 设为索引" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "关系查看" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "规划表结构" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add column(s)" msgid "Add column" msgstr "增加字段" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "于表结尾" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "于表开头" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "于 %s 之后" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, php-format msgid "Create an index on  %s columns" msgstr "在第 %s 个字段创建索引" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "已分区" @@ -8295,6 +7934,10 @@ msgstr "如果你不需要，请注释以下两行。" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "SQL 语句已导出。请复制保存或运行它。" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "关闭" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" diff --git a/po/zh_TW.po b/po/zh_TW.po old mode 100755 new mode 100644 index decaa11fc..867e81733 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3,11 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -<<<<<<< HEAD -"POT-Creation-Date: 2010-07-03 21:45+0530\n" -======= "POT-Creation-Date: 2010-07-03 09:00-0400\n" ->>>>>>> origin/master "PO-Revision-Date: 2010-03-12 09:15+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: chinese_traditional \n" @@ -18,11 +14,11 @@ msgstr "" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:38 browse_foreigners.php:59 -#: libraries/display_tbl.lib.php:417 server_privileges.php:1530 +#: libraries/display_tbl.lib.php:417 server_privileges.php:1514 msgid "Show all" msgstr "顯示全部" -#: browse_foreigners.php:82 libraries/common.lib.php:2326 +#: browse_foreigners.php:82 libraries/common.lib.php:2313 #: libraries/display_pdf_schema.lib.php:17 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 @@ -40,53 +36,37 @@ msgstr "" #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 -#: db_structure.php:106 libraries/common.lib.php:2850 -#: libraries/common.lib.php:2857 libraries/db_links.inc.php:75 +#: db_structure.php:106 libraries/common.lib.php:2831 +#: libraries/common.lib.php:2838 libraries/db_links.inc.php:75 #: libraries/tbl_links.inc.php:63 msgid "Search" msgstr "搜索" -#: browse_foreigners.php:153 db_operations.php:396 db_operations.php:440 -#: db_operations.php:510 db_operations.php:620 db_search.php:374 -#: db_structure.php:565 js/messages.php:53 libraries/Config.class.php:1046 +#: browse_foreigners.php:153 db_operations.php:385 db_operations.php:429 +#: db_operations.php:499 db_operations.php:609 db_search.php:362 +#: db_structure.php:567 js/messages.php:48 libraries/Config.class.php:1046 #: libraries/Theme_Manager.class.php:311 #: libraries/auth/cookie.auth.lib.php:290 libraries/common.lib.php:719 -<<<<<<< HEAD -#: libraries/common.lib.php:1344 libraries/common.lib.php:2301 -#: libraries/display_change_password.lib.php:82 -#: libraries/display_create_table.lib.php:62 -======= #: libraries/common.lib.php:1335 libraries/common.lib.php:2288 #: libraries/display_change_password.lib.php:82 #: libraries/display_create_table.lib.php:63 ->>>>>>> origin/master #: libraries/display_export.lib.php:275 libraries/display_import.lib.php:275 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:532 #: libraries/display_tbl.lib.php:614 libraries/replication_gui.lib.php:76 #: libraries/replication_gui.lib.php:372 libraries/select_server.lib.php:104 -<<<<<<< HEAD -#: libraries/sql_query_form.lib.php:403 libraries/sql_query_form.lib.php:480 -#: libraries/sql_query_form.lib.php:555 libraries/tbl_properties.inc.php:782 -======= #: libraries/sql_query_form.lib.php:400 libraries/sql_query_form.lib.php:477 #: libraries/sql_query_form.lib.php:552 libraries/tbl_properties.inc.php:782 ->>>>>>> origin/master #: main.php:128 navigation.php:237 pdf_pages.php:292 pdf_pages.php:328 #: pdf_pages.php:530 pmd_pdf.php:116 server_binlog.php:142 -#: server_privileges.php:665 server_privileges.php:1641 -#: server_privileges.php:1993 server_privileges.php:2040 -#: server_privileges.php:2080 server_replication.php:235 +#: server_privileges.php:664 server_privileges.php:1624 +#: server_privileges.php:1971 server_privileges.php:2018 +#: server_privileges.php:2057 server_replication.php:235 #: server_replication.php:318 server_replication.php:341 #: server_synchronize.php:1209 tbl_change.php:329 tbl_change.php:1171 #: tbl_change.php:1208 tbl_indexes.php:254 tbl_operations.php:265 #: tbl_operations.php:302 tbl_operations.php:499 tbl_operations.php:561 -<<<<<<< HEAD -#: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:560 -#: tbl_structure.php:595 tbl_tracking.php:395 tbl_tracking.php:512 -======= #: tbl_operations.php:681 tbl_select.php:325 tbl_structure.php:562 #: tbl_structure.php:597 tbl_tracking.php:395 tbl_tracking.php:512 ->>>>>>> origin/master #: view_create.php:182 view_operations.php:101 msgid "Go" msgstr "執行" @@ -112,7 +92,7 @@ msgstr "使用此值" msgid "Database %1$s has been created." msgstr "資料庫 %s 已被刪除" -#: db_datadict.php:49 db_operations.php:389 +#: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " msgstr "資料庫註解文字: " @@ -139,17 +119,10 @@ msgstr "欄位名稱" #: libraries/db_structure.lib.php:60 libraries/export/htmlword.php:245 #: libraries/export/latex.php:360 libraries/export/odt.php:297 #: libraries/export/texytext.php:234 libraries/tbl_properties.inc.php:100 -<<<<<<< HEAD -#: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2093 -#: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 -#: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 -#: tbl_structure.php:657 tbl_tracking.php:274 tbl_tracking.php:321 -======= #: pdf_schema.php:1263 pdf_schema.php:1284 server_privileges.php:2070 #: tbl_change.php:286 tbl_change.php:313 tbl_printview.php:142 #: tbl_printview.php:312 tbl_select.php:135 tbl_structure.php:178 #: tbl_structure.php:659 tbl_tracking.php:274 tbl_tracking.php:321 ->>>>>>> origin/master msgid "Type" msgstr "型態" @@ -162,7 +135,7 @@ msgstr "型態" msgid "Null" msgstr "Null" -#: db_datadict.php:178 db_structure.php:499 libraries/export/htmlword.php:247 +#: db_datadict.php:178 db_structure.php:501 libraries/export/htmlword.php:247 #: libraries/export/latex.php:360 libraries/export/odt.php:303 #: libraries/export/texytext.php:236 libraries/tbl_properties.inc.php:106 #: pdf_schema.php:1266 pdf_schema.php:1287 tbl_printview.php:145 @@ -186,24 +159,18 @@ msgstr "連結到" msgid "Comments" msgstr "註解" -#: db_datadict.php:267 js/messages.php:72 libraries/Index.class.php:359 +#: db_datadict.php:267 libraries/Index.class.php:359 #: libraries/Index.class.php:386 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:263 -<<<<<<< HEAD -#: pdf_schema.php:1344 server_privileges.php:1585 server_privileges.php:1596 -#: server_privileges.php:1911 server_privileges.php:1916 -#: server_privileges.php:2210 sql.php:132 sql.php:194 tbl_printview.php:228 -======= #: pdf_schema.php:1344 server_privileges.php:1568 server_privileges.php:1579 #: server_privileges.php:1889 server_privileges.php:1894 #: server_privileges.php:2187 sql.php:132 sql.php:194 tbl_printview.php:228 ->>>>>>> origin/master #: tbl_structure.php:350 tbl_tracking.php:337 tbl_tracking.php:342 msgid "No" msgstr " 否 " -#: db_datadict.php:267 js/messages.php:71 libraries/Index.class.php:360 +#: db_datadict.php:267 libraries/Index.class.php:360 #: libraries/Index.class.php:385 libraries/export/htmlword.php:322 #: libraries/export/latex.php:430 libraries/export/odt.php:368 #: libraries/export/texytext.php:311 libraries/mult_submits.inc.php:45 @@ -212,15 +179,9 @@ msgstr " 否 " #: libraries/mult_submits.inc.php:101 libraries/mult_submits.inc.php:106 #: libraries/mult_submits.inc.php:111 libraries/mult_submits.inc.php:262 #: libraries/mult_submits.inc.php:273 pdf_schema.php:1344 -<<<<<<< HEAD -#: server_databases.php:64 server_privileges.php:1582 -#: server_privileges.php:1596 server_privileges.php:1911 -#: server_privileges.php:1914 server_privileges.php:2210 sql.php:193 -======= #: server_databases.php:64 server_privileges.php:1565 #: server_privileges.php:1579 server_privileges.php:1889 #: server_privileges.php:1892 server_privileges.php:2187 sql.php:193 ->>>>>>> origin/master #: tbl_printview.php:228 tbl_structure.php:40 tbl_structure.php:350 #: tbl_tracking.php:335 tbl_tracking.php:340 msgid "Yes" @@ -239,156 +200,148 @@ msgstr "檢視資料庫的備份概要 (dump schema)" msgid "No tables found in database." msgstr "資料庫中沒有資料表" -#: db_export.php:43 db_search.php:356 server_export.php:27 +#: db_export.php:43 db_search.php:344 server_export.php:27 msgid "Select All" msgstr "全選" -#: db_export.php:45 db_search.php:359 server_export.php:29 +#: db_export.php:45 db_search.php:347 server_export.php:29 msgid "Unselect All" msgstr "全部取消" -#: db_operations.php:43 tbl_create.php:54 +#: db_operations.php:38 tbl_create.php:54 msgid "The database name is empty!" msgstr "資料庫名稱並未輸入!!" -#: db_operations.php:241 +#: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" msgstr "資料庫 %s 已更改名稱為 %s" -#: db_operations.php:245 +#: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" msgstr "資料庫 %s 已複製到 %s" -#: db_operations.php:423 +#: db_operations.php:412 msgid "Rename database to" msgstr "更改資料庫名稱到" -#: db_operations.php:428 server_processlist.php:57 +#: db_operations.php:417 server_processlist.php:57 msgid "Command" msgstr "指令" -<<<<<<< HEAD -#: db_operations.php:466 -======= #: db_operations.php:429 tbl_change.php:1140 msgid "and then" msgstr "然後" #: db_operations.php:455 ->>>>>>> origin/master msgid "Copy database to" msgstr "複製資料庫到" -#: db_operations.php:473 tbl_operations.php:528 tbl_tracking.php:388 +#: db_operations.php:462 tbl_operations.php:528 tbl_tracking.php:388 msgid "Structure only" msgstr "只有結構" -#: db_operations.php:474 tbl_operations.php:529 tbl_tracking.php:390 +#: db_operations.php:463 tbl_operations.php:529 tbl_tracking.php:390 msgid "Structure and data" msgstr "結構與資料" -#: db_operations.php:475 tbl_operations.php:530 tbl_tracking.php:389 +#: db_operations.php:464 tbl_operations.php:530 tbl_tracking.php:389 msgid "Data only" msgstr "只有資料" -#: db_operations.php:483 +#: db_operations.php:472 msgid "CREATE DATABASE before copying" msgstr "複製前建立資料庫 (CREATE DATABASE)" -#: db_operations.php:486 libraries/export/sql.php:52 +#: db_operations.php:475 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 #: libraries/export/sql.php:82 tbl_operations.php:536 #, php-format msgid "Add %s" msgstr "" -#: db_operations.php:490 libraries/export/sql.php:78 tbl_operations.php:299 +#: db_operations.php:479 libraries/export/sql.php:78 tbl_operations.php:299 #: tbl_operations.php:538 msgid "Add AUTO_INCREMENT value" msgstr "新增 AUTO_INCREMENT 數值" -#: db_operations.php:494 tbl_operations.php:545 +#: db_operations.php:483 tbl_operations.php:545 msgid "Add constraints" msgstr "加入限制" -#: db_operations.php:507 +#: db_operations.php:496 msgid "Switch to copied database" msgstr "轉移到複製之資料庫" -#: db_operations.php:548 +#: db_operations.php:537 msgid "BLOB Repository" msgstr "" -#: db_operations.php:551 db_tracking.php:76 libraries/common.lib.php:1361 -#: libraries/server_links.inc.php:50 server_processlist.php:59 +#: db_operations.php:540 db_tracking.php:76 libraries/common.lib.php:1352 +#: libraries/server_links.inc.php:49 server_processlist.php:59 #: tbl_tracking.php:596 test/theme.php:101 msgid "Status" msgstr "狀態" -#: db_operations.php:559 +#: db_operations.php:548 #, fuzzy #| msgid "Enabled" msgctxt "BLOB repository" msgid "Enabled" msgstr "啟動" -#: db_operations.php:563 +#: db_operations.php:552 #, fuzzy msgid "Disable" msgstr "未啟動" -#: db_operations.php:573 +#: db_operations.php:562 msgid "Damaged" msgstr "" -#: db_operations.php:577 +#: db_operations.php:566 #, fuzzy msgctxt "BLOB repository" msgid "Repair" msgstr "修復資料表" -#: db_operations.php:585 +#: db_operations.php:574 #, fuzzy #| msgid "Disabled" msgctxt "BLOB repository" msgid "Disabled" msgstr "未啟動" -#: db_operations.php:589 +#: db_operations.php:578 #, fuzzy msgid "Enable" msgstr "啟動" -#: db_operations.php:613 libraries/Index.class.php:448 +#: db_operations.php:602 libraries/Index.class.php:448 #: libraries/db_structure.lib.php:62 libraries/mysql_charsets.lib.php:107 #: libraries/tbl_properties.inc.php:107 libraries/tbl_properties.inc.php:730 #: server_collations.php:54 server_collations.php:66 server_databases.php:111 #: tbl_operations.php:363 tbl_select.php:136 tbl_structure.php:179 -<<<<<<< HEAD -#: tbl_structure.php:765 tbl_tracking.php:275 tbl_tracking.php:326 -======= #: tbl_structure.php:767 tbl_tracking.php:275 tbl_tracking.php:326 ->>>>>>> origin/master msgid "Collation" msgstr "校對" -#: db_operations.php:626 main.php:316 pdf_schema.php:34 +#: db_operations.php:615 main.php:316 pdf_schema.php:34 #, php-format msgid "" "The additional features for working with linked tables have been " "deactivated. To find out why click %shere%s." msgstr "關聯資料表的附加功能未能啟動, %s請按此%s 查出問題原因." -#: db_operations.php:659 +#: db_operations.php:648 msgid "Edit PDF Pages" msgstr "編輯 PDF 頁碼" #: db_printview.php:104 db_tracking.php:72 db_tracking.php:157 #: libraries/db_structure.lib.php:46 libraries/export/xml.php:328 -#: libraries/header.inc.php:130 pdf_pages.php:424 server_privileges.php:1687 -#: server_privileges.php:1743 server_privileges.php:2007 +#: libraries/header.inc.php:126 pdf_pages.php:424 server_privileges.php:1665 +#: server_privileges.php:1721 server_privileges.php:1985 #: server_synchronize.php:423 server_synchronize.php:866 tbl_tracking.php:592 #: test/theme.php:75 msgid "Table" @@ -397,11 +350,7 @@ msgstr "資料表" #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/header_printview.inc.php:63 libraries/import.lib.php:146 #: navigation.php:638 navigation.php:660 server_databases.php:122 -<<<<<<< HEAD -#: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:775 -======= #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 ->>>>>>> origin/master msgid "Rows" msgstr "資料列列數" @@ -409,42 +358,30 @@ msgstr "資料列列數" msgid "Size" msgstr "大小" -#: db_printview.php:162 db_structure.php:455 libraries/export/sql.php:559 +#: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 msgid "in use" msgstr "使用中" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 pdf_schema.php:1241 tbl_printview.php:433 -<<<<<<< HEAD -#: tbl_structure.php:807 -======= #: tbl_structure.php:809 ->>>>>>> origin/master msgid "Creation" msgstr "建立" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 pdf_schema.php:1246 tbl_printview.php:443 -<<<<<<< HEAD -#: tbl_structure.php:815 -======= #: tbl_structure.php:817 ->>>>>>> origin/master msgid "Last update" msgstr "最後更新" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 pdf_schema.php:1251 tbl_printview.php:453 -<<<<<<< HEAD -#: tbl_structure.php:823 -======= #: tbl_structure.php:825 ->>>>>>> origin/master msgid "Last check" msgstr "最後檢查" -#: db_printview.php:222 db_structure.php:478 +#: db_printview.php:222 db_structure.php:480 #, fuzzy, php-format #| msgid "%s table(s)" msgid "%s table" @@ -505,11 +442,7 @@ msgstr "移除" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:165 libraries/tbl_properties.inc.php:779 -<<<<<<< HEAD -#: server_privileges.php:298 tbl_change.php:1028 tbl_indexes.php:250 -======= #: server_privileges.php:297 tbl_change.php:1028 tbl_indexes.php:250 ->>>>>>> origin/master #: tbl_select.php:286 msgid "Or" msgstr "或" @@ -543,85 +476,85 @@ msgstr "使用資料表" msgid "SQL query on database %s:" msgstr "在資料庫 %s 執行 SQL 語法:" -#: db_qbe.php:934 libraries/common.lib.php:1228 +#: db_qbe.php:934 libraries/common.lib.php:1225 msgid "Submit Query" msgstr "執行語法" -#: db_search.php:71 libraries/auth/config.auth.lib.php:84 +#: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 #: libraries/auth/cookie.auth.lib.php:671 libraries/auth/http.auth.lib.php:52 #: libraries/auth/signon.auth.lib.php:183 msgid "Access denied" msgstr "拒絕存取" -#: db_search.php:83 db_search.php:323 +#: db_search.php:80 db_search.php:311 msgid "at least one of the words" msgstr "任何一組文字" -#: db_search.php:84 db_search.php:324 +#: db_search.php:81 db_search.php:312 msgid "all words" msgstr "所有文字" -#: db_search.php:85 db_search.php:325 +#: db_search.php:82 db_search.php:313 msgid "the exact phrase" msgstr "完整詞語" -#: db_search.php:86 db_search.php:326 +#: db_search.php:83 db_search.php:314 msgid "as regular expression" msgstr "以規則表示法 (regular expression) 搜索" -#: db_search.php:248 +#: db_search.php:242 #, php-format msgid "Search results for \"%s\" %s:" msgstr "搜索 \"%s\" 的結果 %s:" -#: db_search.php:266 +#: db_search.php:260 #, php-format msgid "%s match(es) inside table %s" msgstr "%s 項資料符合 - 於資料表 %s" -#: db_search.php:273 db_structure.php:77 db_structure.php:78 +#: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 -#: db_structure.php:105 libraries/common.lib.php:2852 +#: db_structure.php:105 libraries/common.lib.php:2833 #: libraries/mult_submits.inc.php:116 libraries/tbl_links.inc.php:50 -#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:465 +#: tbl_structure.php:37 tbl_structure.php:49 tbl_structure.php:467 msgid "Browse" msgstr "瀏覽" -#: db_search.php:278 libraries/display_tbl.lib.php:1165 -#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:473 +#: db_search.php:272 libraries/display_tbl.lib.php:1165 +#: libraries/display_tbl.lib.php:2056 libraries/sql_query_form.lib.php:470 #: pdf_pages.php:286 pdf_pages.php:425 pdf_pages.php:461 pdf_pages.php:489 #: pmd_general.php:377 setup/frames/index.inc.php:125 #: setup/frames/index.inc.php:216 tbl_row_action.php:63 msgid "Delete" msgstr "刪除" -#: db_search.php:291 +#: db_search.php:285 #, php-format msgid "Total: %s match(es)" msgstr "總計: %s 項資料符合" -#: db_search.php:311 +#: db_search.php:299 msgid "Search in database" msgstr "搜索資料庫" -#: db_search.php:314 +#: db_search.php:302 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgstr "尋找之文字或數值 (萬用字元: \"%\"):" -#: db_search.php:319 +#: db_search.php:307 msgid "Find:" msgstr "尋找:" -#: db_search.php:323 db_search.php:324 +#: db_search.php:311 db_search.php:312 msgid "Words are separated by a space character (\" \")." msgstr "每組文字以空格 (\" \") 分隔." -#: db_search.php:337 +#: db_search.php:325 msgid "Inside table(s):" msgstr "於以下資料表:" -#: db_search.php:367 +#: db_search.php:355 #, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" @@ -629,36 +562,36 @@ msgstr "於以下資料表:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 -#: libraries/common.lib.php:2851 libraries/sql_query_form.lib.php:337 -#: libraries/sql_query_form.lib.php:340 libraries/tbl_links.inc.php:76 +#: libraries/common.lib.php:2832 libraries/sql_query_form.lib.php:334 +#: libraries/sql_query_form.lib.php:337 libraries/tbl_links.inc.php:76 msgid "Insert" msgstr "新增" #: db_structure.php:83 db_structure.php:96 db_structure.php:109 -#: libraries/common.lib.php:2848 libraries/common.lib.php:2855 +#: libraries/common.lib.php:2829 libraries/common.lib.php:2836 #: libraries/db_links.inc.php:63 libraries/export/htmlword.php:23 #: libraries/export/latex.php:33 libraries/export/latex.php:337 #: libraries/export/odt.php:32 libraries/export/sql.php:60 #: libraries/export/texytext.php:23 libraries/import.lib.php:1106 #: libraries/tbl_links.inc.php:56 pmd_general.php:134 -#: server_privileges.php:594 server_replication.php:315 tbl_tracking.php:269 +#: server_privileges.php:593 server_replication.php:315 tbl_tracking.php:269 msgid "Structure" msgstr "結構" #: db_structure.php:84 db_structure.php:85 db_structure.php:97 #: db_structure.php:98 db_structure.php:110 db_structure.php:111 -#: db_structure.php:543 db_structure.php:544 db_tracking.php:91 -#: libraries/Index.class.php:483 libraries/common.lib.php:1666 +#: db_structure.php:545 db_structure.php:546 db_tracking.php:91 +#: libraries/Index.class.php:483 libraries/common.lib.php:1656 #: libraries/db_links.inc.php:100 libraries/mult_submits.inc.php:36 #: libraries/mult_submits.inc.php:73 libraries/tbl_links.inc.php:127 #: server_databases.php:352 tbl_structure.php:27 tbl_structure.php:151 -#: tbl_structure.php:152 tbl_structure.php:469 +#: tbl_structure.php:152 tbl_structure.php:471 msgid "Drop" msgstr "刪除" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 -#: db_structure.php:541 db_structure.php:542 libraries/common.lib.php:1665 +#: db_structure.php:543 db_structure.php:544 libraries/common.lib.php:1655 #: libraries/mult_submits.inc.php:39 libraries/tbl_links.inc.php:105 msgid "Empty" msgstr "清空" @@ -668,117 +601,111 @@ msgstr "清空" msgid "Table %s has been emptied" msgstr "資料表 %s 已被清空" -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" msgstr "檢視 %s 己被刪除." -#: db_structure.php:325 libraries/tbl_links.inc.php:133 +#: db_structure.php:326 libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" msgstr "資料表 %s 已被刪除" -#: db_structure.php:332 +#: db_structure.php:333 msgid "Tracking is active." msgstr "" -#: db_structure.php:334 +#: db_structure.php:335 msgid "Tracking is not active." msgstr "" -#: db_structure.php:418 libraries/display_tbl.lib.php:1944 +#: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" -#: db_structure.php:432 db_structure.php:446 libraries/header.inc.php:130 +#: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 msgid "View" msgstr "檢視" -#: db_structure.php:483 libraries/db_structure.lib.php:49 -#: libraries/server_links.inc.php:71 server_replication.php:33 +#: db_structure.php:485 libraries/db_structure.lib.php:49 +#: libraries/server_links.inc.php:70 server_replication.php:33 #: server_replication.php:164 server_status.php:369 msgid "Replication" msgstr "複製" -#: db_structure.php:487 +#: db_structure.php:489 msgid "Sum" msgstr "總計" -#: db_structure.php:494 libraries/StorageEngine.class.php:356 +#: db_structure.php:496 libraries/StorageEngine.class.php:356 #, php-format msgid "%s is the default storage engine on this MySQL server." msgstr "這 MySQL 伺服器的預設儲存引擎是 %s " -#: db_structure.php:522 db_structure.php:539 db_structure.php:540 +#: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 #: libraries/mult_submits.inc.php:16 server_databases.php:346 -#: server_databases.php:351 server_privileges.php:1613 tbl_structure.php:453 -#: tbl_structure.php:462 +#: server_databases.php:351 server_privileges.php:1596 tbl_structure.php:455 +#: tbl_structure.php:464 msgid "With selected:" msgstr "選擇的資料表：" -#: db_structure.php:525 libraries/display_tbl.lib.php:2076 -#: server_databases.php:348 server_privileges.php:570 -#: server_privileges.php:1616 tbl_structure.php:456 +#: db_structure.php:527 libraries/display_tbl.lib.php:2076 +#: server_databases.php:348 server_privileges.php:569 +#: server_privileges.php:1599 tbl_structure.php:458 msgid "Check All" msgstr "全選" -<<<<<<< HEAD -#: db_structure.php:529 libraries/display_tbl.lib.php:2077 -#: libraries/replication_gui.lib.php:36 server_databases.php:350 -#: server_privileges.php:573 server_privileges.php:1620 tbl_structure.php:460 -======= #: db_structure.php:531 libraries/display_tbl.lib.php:2077 #: libraries/replication_gui.lib.php:36 server_databases.php:350 #: server_privileges.php:572 server_privileges.php:1603 tbl_structure.php:462 ->>>>>>> origin/master msgid "Uncheck All" msgstr "全部取消" -#: db_structure.php:534 +#: db_structure.php:536 msgid "Check tables having overhead" msgstr "檢查額外記錄 (overhead)" -#: db_structure.php:545 db_structure.php:546 db_structure.php:597 +#: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/mult_submits.inc.php:28 -#: tbl_structure.php:490 tbl_structure.php:492 +#: tbl_structure.php:492 tbl_structure.php:494 msgid "Print view" msgstr "列印檢視" -#: db_structure.php:547 db_structure.php:548 libraries/mult_submits.inc.php:42 +#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:42 #: tbl_operations.php:581 msgid "Check table" msgstr "檢查資料表" -#: db_structure.php:549 db_structure.php:550 libraries/mult_submits.inc.php:47 -#: tbl_operations.php:621 tbl_structure.php:707 tbl_structure.php:709 +#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:47 +#: tbl_operations.php:621 tbl_structure.php:709 tbl_structure.php:711 msgid "Optimize table" msgstr "最佳化資料表" -#: db_structure.php:551 db_structure.php:552 libraries/mult_submits.inc.php:52 +#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:52 #: tbl_operations.php:611 msgid "Repair table" msgstr "修復資料表" -#: db_structure.php:553 db_structure.php:554 libraries/mult_submits.inc.php:57 +#: db_structure.php:555 db_structure.php:556 libraries/mult_submits.inc.php:57 #: tbl_operations.php:601 msgid "Analyze table" msgstr "分析資料表" -#: db_structure.php:555 db_structure.php:556 libraries/db_links.inc.php:71 +#: db_structure.php:557 db_structure.php:558 libraries/db_links.inc.php:71 #: libraries/display_export.lib.php:83 libraries/display_tbl.lib.php:2094 #: libraries/display_tbl.lib.php:2225 libraries/mult_submits.inc.php:62 -#: libraries/server_links.inc.php:85 libraries/tbl_links.inc.php:82 -#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1391 +#: libraries/server_links.inc.php:84 libraries/tbl_links.inc.php:82 +#: pmd_pdf.php:84 pmd_pdf.php:109 server_privileges.php:1380 #: setup/frames/menu.inc.php:22 tbl_row_action.php:59 msgid "Export" msgstr "輸出" -#: db_structure.php:604 libraries/display_pdf_schema.lib.php:44 +#: db_structure.php:606 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" msgstr "數據字典" @@ -789,10 +716,10 @@ msgstr "" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 #: libraries/export/sql.php:342 libraries/export/texytext.php:84 -#: libraries/export/xml.php:255 libraries/header.inc.php:110 +#: libraries/export/xml.php:255 libraries/header.inc.php:106 #: libraries/header_printview.inc.php:58 server_databases.php:169 -#: server_privileges.php:1682 server_privileges.php:1743 -#: server_privileges.php:2001 server_processlist.php:56 +#: server_privileges.php:1660 server_privileges.php:1721 +#: server_privileges.php:1979 server_processlist.php:56 #: server_synchronize.php:1179 server_synchronize.php:1183 #: tbl_tracking.php:591 test/theme.php:65 msgid "Database" @@ -813,8 +740,8 @@ msgstr "" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 server_databases.php:203 -#: server_privileges.php:1559 server_privileges.php:1747 -#: server_privileges.php:2096 tbl_structure.php:187 +#: server_privileges.php:1542 server_privileges.php:1725 +#: server_privileges.php:2073 tbl_structure.php:187 msgid "Action" msgstr "執行" @@ -850,8 +777,8 @@ msgstr "只有結構" msgid "Untracked tables" msgstr "" -#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:526 -#: tbl_structure.php:528 +#: db_tracking.php:172 db_tracking.php:174 tbl_structure.php:528 +#: tbl_structure.php:530 #, fuzzy msgid "Track table" msgstr "檢查資料表" @@ -926,7 +853,7 @@ msgstr "書籤已經刪除." msgid "Showing bookmark" msgstr "顯示書籤" -#: import.php:403 sql.php:654 +#: import.php:403 sql.php:626 #, php-format msgid "Bookmark %s created" msgstr "書籤 %s 已建立" @@ -1005,294 +932,189 @@ msgstr "請輸入主機名稱!" msgid "The user name is empty!" msgstr "請輸入使用者名稱!" -#: js/messages.php:44 server_privileges.php:1237 user_password.php:70 +#: js/messages.php:44 server_privileges.php:1236 user_password.php:70 msgid "The password is empty!" msgstr "請輸入密碼!" -#: js/messages.php:45 server_privileges.php:1235 user_password.php:73 +#: js/messages.php:45 server_privileges.php:1234 user_password.php:73 msgid "The passwords aren't the same!" msgstr "第二次輸入的密碼不同!" -#: js/messages.php:46 -#, fuzzy -#| msgid "Add a new User" -msgid "Add a New User" -msgstr "新增使用者" - -#: js/messages.php:47 -#, fuzzy -msgid "Create User" -msgstr "伺服器版本" - -#: js/messages.php:48 -#, fuzzy -msgid "Reloading Privileges" -msgstr "整體權限" - -#: js/messages.php:49 -#, fuzzy -#| msgid "Remove selected users" -msgid "Removing Selected Users" -msgstr "移除已選擇使用者" - -#: js/messages.php:50 tbl_tracking.php:251 tbl_tracking.php:379 -msgid "Close" -msgstr "" - -#: js/messages.php:54 pmd_general.php:342 pmd_general.php:379 +#: js/messages.php:49 pmd_general.php:342 pmd_general.php:379 msgid "Cancel" msgstr "" -#: js/messages.php:57 -#, fuzzy -msgid "Loading" -msgstr "本地" - -#: js/messages.php:58 -#, fuzzy -#| msgid "Processes" -msgid "Processing Request" -msgstr "處理" - -#: js/messages.php:59 -msgid "Error in Processing Request" -msgstr "" - -#: js/messages.php:60 -msgid "Dropping Column" -msgstr "" - -#: js/messages.php:61 -msgid "Adding Primary Key" -msgstr "" - -#: js/messages.php:62 libraries/relation.lib.php:99 pmd_general.php:340 -msgid "OK" -msgstr "確定" - -#: js/messages.php:65 -#, fuzzy -#| msgid "Rename database to" -msgid "Renaming Databases" -msgstr "更改資料庫名稱到" - -#: js/messages.php:66 -#, fuzzy -#| msgid "Database" -msgid "Reload Database" -msgstr "資料庫" - -#: js/messages.php:67 -#, fuzzy -#| msgid "Copy database to" -msgid "Copying Database" -msgstr "複製資料庫到" - -#: js/messages.php:68 -#, fuzzy -#| msgid "Charset" -msgid "Changing Charset" -msgstr "文字編碼 (Charset)" - -#: js/messages.php:69 -#, fuzzy -#| msgid "Table must have at least one field." -msgid "Table must have atleast 1 column" -msgstr "資料表最少需要有一個欄位." - -#: js/messages.php:70 -#, fuzzy -msgid "Create Table" -msgstr "建立新一頁" - -#: js/messages.php:75 -#, fuzzy -#| msgid "Search" -msgid "Searching" -msgstr "搜索" - -#: js/messages.php:78 -msgid "Toggle Query Box Visibility" -msgstr "" - -#: js/messages.php:81 pmd_save_pos.php:54 +#: js/messages.php:52 pmd_save_pos.php:54 msgid "Modifications have been saved" msgstr "修改已儲存" -#: js/messages.php:82 pmd_relation_upd.php:49 +#: js/messages.php:53 pmd_relation_upd.php:49 #, fuzzy msgid "Relation deleted" msgstr "關聯檢視" -#: js/messages.php:83 pmd_relation_new.php:64 +#: js/messages.php:54 pmd_relation_new.php:64 msgid "FOREIGN KEY relation added" msgstr "" -#: js/messages.php:84 pmd_relation_new.php:86 +#: js/messages.php:55 pmd_relation_new.php:86 #, fuzzy msgid "Internal relation added" msgstr "內部關聯" -#: js/messages.php:85 pmd_relation_new.php:63 pmd_relation_new.php:88 +#: js/messages.php:56 pmd_relation_new.php:63 pmd_relation_new.php:88 msgid "Error: Relation not added." msgstr "" -#: js/messages.php:86 pmd_relation_new.php:31 +#: js/messages.php:57 pmd_relation_new.php:31 msgid "Error: relation already exists." msgstr "" -#: js/messages.php:87 +#: js/messages.php:58 msgid "Error saving coordinates for Designer." msgstr "" -#: js/messages.php:88 libraries/relation.lib.php:107 +#: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" msgstr "一般關聯功能" -#: js/messages.php:88 libraries/relation.lib.php:101 +#: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" msgstr "未啟動" -#: js/messages.php:89 +#: js/messages.php:60 msgid "Select referenced key" msgstr "" -#: js/messages.php:90 +#: js/messages.php:61 msgid "Select Foreign Key" msgstr "" -#: js/messages.php:91 +#: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" -#: js/messages.php:92 pmd_general.php:77 tbl_relation.php:548 +#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 #, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "選擇顯示之欄位" #. l10n: Display text for calendar close link -#: js/messages.php:102 +#: js/messages.php:73 #, fuzzy #| msgid "None" msgid "Done" msgstr "不適用" #. l10n: Display text for previous month link in calendar -#: js/messages.php:104 +#: js/messages.php:75 #, fuzzy #| msgid "Previous" msgid "Prev" msgstr "前一頁" #. l10n: Display text for next month link in calendar -<<<<<<< HEAD -#: js/messages.php:106 libraries/common.lib.php:2366 -#: libraries/common.lib.php:2369 libraries/display_tbl.lib.php:338 -#: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 -#: tbl_structure.php:799 -======= #: js/messages.php:77 libraries/common.lib.php:2353 #: libraries/common.lib.php:2356 libraries/display_tbl.lib.php:338 #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 ->>>>>>> origin/master msgid "Next" msgstr "下一個" #. l10n: Display text for current month link in calendar -#: js/messages.php:108 +#: js/messages.php:79 #, fuzzy #| msgid "Total" msgid "Today" msgstr "總共" -#: js/messages.php:111 +#: js/messages.php:82 #, fuzzy #| msgid "Binary" msgid "January" msgstr "二進制碼" -#: js/messages.php:112 +#: js/messages.php:83 msgid "February" msgstr "" -#: js/messages.php:113 +#: js/messages.php:84 #, fuzzy #| msgid "Mar" msgid "March" msgstr "Mar" -#: js/messages.php:114 +#: js/messages.php:85 #, fuzzy #| msgid "Apr" msgid "April" msgstr "Apr" -#: js/messages.php:115 +#: js/messages.php:86 msgid "May" msgstr "May" -#: js/messages.php:116 +#: js/messages.php:87 #, fuzzy #| msgid "Jun" msgid "June" msgstr "Jun" -#: js/messages.php:117 +#: js/messages.php:88 #, fuzzy #| msgid "Jul" msgid "July" msgstr "Jul" -#: js/messages.php:118 +#: js/messages.php:89 #, fuzzy #| msgid "Aug" msgid "August" msgstr "Aug" -#: js/messages.php:119 +#: js/messages.php:90 msgid "September" msgstr "" -#: js/messages.php:120 +#: js/messages.php:91 #, fuzzy #| msgid "Oct" msgid "October" msgstr "Oct" -#: js/messages.php:121 +#: js/messages.php:92 msgid "November" msgstr "" -#: js/messages.php:122 +#: js/messages.php:93 msgid "December" msgstr "" #. l10n: Short month name -#: js/messages.php:126 libraries/common.lib.php:1566 +#: js/messages.php:97 libraries/common.lib.php:1557 msgid "Jan" msgstr "Jan" #. l10n: Short month name -#: js/messages.php:128 libraries/common.lib.php:1568 +#: js/messages.php:99 libraries/common.lib.php:1559 msgid "Feb" msgstr "Feb" #. l10n: Short month name -#: js/messages.php:130 libraries/common.lib.php:1570 +#: js/messages.php:101 libraries/common.lib.php:1561 msgid "Mar" msgstr "Mar" #. l10n: Short month name -#: js/messages.php:132 libraries/common.lib.php:1572 +#: js/messages.php:103 libraries/common.lib.php:1563 msgid "Apr" msgstr "Apr" #. l10n: Short month name -#: js/messages.php:134 libraries/common.lib.php:1574 +#: js/messages.php:105 libraries/common.lib.php:1565 #, fuzzy #| msgid "May" msgctxt "Short month name" @@ -1300,176 +1122,176 @@ msgid "May" msgstr "May" #. l10n: Short month name -#: js/messages.php:136 libraries/common.lib.php:1576 +#: js/messages.php:107 libraries/common.lib.php:1567 msgid "Jun" msgstr "Jun" #. l10n: Short month name -#: js/messages.php:138 libraries/common.lib.php:1578 +#: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" msgstr "Jul" #. l10n: Short month name -#: js/messages.php:140 libraries/common.lib.php:1580 +#: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" msgstr "Aug" #. l10n: Short month name -#: js/messages.php:142 libraries/common.lib.php:1582 +#: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" msgstr "Sep" #. l10n: Short month name -#: js/messages.php:144 libraries/common.lib.php:1584 +#: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" msgstr "Oct" #. l10n: Short month name -#: js/messages.php:146 libraries/common.lib.php:1586 +#: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" msgstr "Nov" #. l10n: Short month name -#: js/messages.php:148 libraries/common.lib.php:1588 +#: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" msgstr "Dec" -#: js/messages.php:151 +#: js/messages.php:122 #, fuzzy #| msgid "Sun" msgid "Sunday" msgstr "Sun" -#: js/messages.php:152 +#: js/messages.php:123 #, fuzzy #| msgid "Mon" msgid "Monday" msgstr "Mon" -#: js/messages.php:153 +#: js/messages.php:124 #, fuzzy #| msgid "Tue" msgid "Tuesday" msgstr "Tue" -#: js/messages.php:154 +#: js/messages.php:125 msgid "Wednesday" msgstr "" -#: js/messages.php:155 +#: js/messages.php:126 msgid "Thursday" msgstr "" -#: js/messages.php:156 +#: js/messages.php:127 #, fuzzy #| msgid "Fri" msgid "Friday" msgstr "Fri" -#: js/messages.php:157 +#: js/messages.php:128 msgid "Saturday" msgstr "" #. l10n: Short week day name -#: js/messages.php:161 libraries/common.lib.php:1591 +#: js/messages.php:132 libraries/common.lib.php:1582 msgid "Sun" msgstr "Sun" #. l10n: Short week day name -#: js/messages.php:163 libraries/common.lib.php:1593 +#: js/messages.php:134 libraries/common.lib.php:1584 msgid "Mon" msgstr "Mon" #. l10n: Short week day name -#: js/messages.php:165 libraries/common.lib.php:1595 +#: js/messages.php:136 libraries/common.lib.php:1586 msgid "Tue" msgstr "Tue" #. l10n: Short week day name -#: js/messages.php:167 libraries/common.lib.php:1597 +#: js/messages.php:138 libraries/common.lib.php:1588 msgid "Wed" msgstr "Wed" #. l10n: Short week day name -#: js/messages.php:169 libraries/common.lib.php:1599 +#: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" msgstr "Thu" #. l10n: Short week day name -#: js/messages.php:171 libraries/common.lib.php:1601 +#: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" msgstr "Fri" #. l10n: Short week day name -#: js/messages.php:173 libraries/common.lib.php:1603 +#: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" msgstr "Sat" #. l10n: Minimal week day name -#: js/messages.php:177 +#: js/messages.php:148 #, fuzzy #| msgid "Sun" msgid "Su" msgstr "Sun" #. l10n: Minimal week day name -#: js/messages.php:179 +#: js/messages.php:150 #, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Mon" #. l10n: Minimal week day name -#: js/messages.php:181 +#: js/messages.php:152 #, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Tue" #. l10n: Minimal week day name -#: js/messages.php:183 +#: js/messages.php:154 #, fuzzy #| msgid "Wed" msgid "We" msgstr "Wed" #. l10n: Minimal week day name -#: js/messages.php:185 +#: js/messages.php:156 #, fuzzy #| msgid "Thu" msgid "Th" msgstr "Thu" #. l10n: Minimal week day name -#: js/messages.php:187 +#: js/messages.php:158 #, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Fri" #. l10n: Minimal week day name -#: js/messages.php:189 +#: js/messages.php:160 #, fuzzy #| msgid "Sat" msgid "Sa" msgstr "Sat" #. l10n: Column header for week of the year in calendar -#: js/messages.php:191 +#: js/messages.php:162 msgid "Wk" msgstr "" -#: js/messages.php:193 +#: js/messages.php:164 msgid "Hour" msgstr "" -#: js/messages.php:194 +#: js/messages.php:165 #, fuzzy #| msgid "in use" msgid "Minute" msgstr "使用中" -#: js/messages.php:195 +#: js/messages.php:166 #, fuzzy #| msgid "per second" msgid "Second" @@ -1527,7 +1349,7 @@ msgstr "索引" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 -#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:472 +#: tbl_structure.php:155 tbl_structure.php:159 tbl_structure.php:474 #: tbl_tracking.php:322 msgid "Unique" msgstr "唯一鍵 UNIQUE" @@ -1546,7 +1368,7 @@ msgid "Comment" msgstr "註解" #: libraries/Index.class.php:466 libraries/common.lib.php:616 -#: libraries/common.lib.php:1204 libraries/display_tbl.lib.php:1117 +#: libraries/common.lib.php:1201 libraries/display_tbl.lib.php:1117 #: libraries/import.lib.php:1089 libraries/import.lib.php:1113 #: pdf_pages.php:285 setup/frames/index.inc.php:124 #: setup/lib/messages.inc.php:352 tbl_row_action.php:69 @@ -1569,8 +1391,8 @@ msgid "" "removed." msgstr "" -#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:42 -#: server_databases.php:88 server_privileges.php:1682 +#: libraries/List_Database.class.php:431 libraries/server_links.inc.php:41 +#: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" msgstr "資料庫" @@ -1737,11 +1559,7 @@ msgstr "密碼:" msgid "Server Choice" msgstr "選擇伺服器" -<<<<<<< HEAD -#: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:63 -======= #: libraries/auth/cookie.auth.lib.php:318 libraries/header.inc.php:59 ->>>>>>> origin/master msgid "Cookies must be enabled past this point." msgstr "Cookies 必須啟動才能登入." @@ -1820,11 +1638,7 @@ msgstr "" "當文編碼模組讀取後,未能使用 iconv, libiconv 或 recode_string 功能. 請檢查您" "的 php 設定." -<<<<<<< HEAD -#: libraries/common.inc.php:580 -======= #: libraries/common.inc.php:576 ->>>>>>> origin/master msgid "" "phpMyAdmin was unable to read your configuration file!
This might " "happen if PHP finds a parse error in it or PHP cannot find the file.
如果按下連結後出現空白頁, 即代表沒有任何問" "題." -<<<<<<< HEAD -#: libraries/common.inc.php:591 -======= #: libraries/common.inc.php:587 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Could not load default configuration from: \"%1$s\"" msgid "Could not load default configuration from: %1$s" msgstr "無法讀取預設設定: \"%1$s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:596 -======= #: libraries/common.inc.php:592 ->>>>>>> origin/master msgid "" "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " "configuration file!" msgstr " 必須在設定檔內設定 $cfg['PmaAbsoluteUri'] !" -<<<<<<< HEAD -#: libraries/common.inc.php:626 -======= #: libraries/common.inc.php:622 ->>>>>>> origin/master #, fuzzy, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" msgstr "伺服器索引錯誤: \"%s\"" -<<<<<<< HEAD -#: libraries/common.inc.php:633 -======= #: libraries/common.inc.php:629 ->>>>>>> origin/master #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "伺服器 %1$s 主機名稱錯誤, 請翻查設定值." -<<<<<<< HEAD -#: libraries/common.inc.php:642 libraries/header.inc.php:100 -======= #: libraries/common.inc.php:638 libraries/header.inc.php:96 ->>>>>>> origin/master #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:47 #: main.php:185 test/theme.php:57 msgid "Server" msgstr "伺服器" -<<<<<<< HEAD -#: libraries/common.inc.php:820 -msgid "Invalid authentication method set in configuration:" -msgstr "於設定內設定錯誤認證方式:" - -#: libraries/common.inc.php:923 -======= #: libraries/common.inc.php:816 msgid "Invalid authentication method set in configuration:" msgstr "於設定內設定錯誤認證方式:" #: libraries/common.inc.php:919 ->>>>>>> origin/master #, php-format msgid "You should upgrade to %s %s or later." msgstr "您應該更新到 %s %s 或之後." @@ -1927,7 +1713,7 @@ msgstr "zh" #: libraries/common.lib.php:432 libraries/common.lib.php:448 #: libraries/common.lib.php:450 libraries/dbg/setup.php:25 #: libraries/display_export.lib.php:164 libraries/relation.lib.php:97 -#: libraries/sql_query_form.lib.php:454 libraries/sql_query_form.lib.php:457 +#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454 #: main.php:229 setup/lib/FormDisplay.tpl.php:124 msgid "Documentation" msgstr "說明文件" @@ -1941,138 +1727,138 @@ msgstr "SQL 語法" msgid "MySQL said: " msgstr "MySQL 傳回： " -#: libraries/common.lib.php:1180 setup/lib/messages.inc.php:353 +#: libraries/common.lib.php:1177 setup/lib/messages.inc.php:353 msgid "Explain SQL" msgstr "說明 SQL" -#: libraries/common.lib.php:1183 +#: libraries/common.lib.php:1180 msgid "Skip Explain SQL" msgstr "略過說明 SQL" -#: libraries/common.lib.php:1217 +#: libraries/common.lib.php:1214 msgid "Without PHP Code" msgstr "移除 PHP 程式碼" -#: libraries/common.lib.php:1220 setup/lib/messages.inc.php:355 +#: libraries/common.lib.php:1217 setup/lib/messages.inc.php:355 msgid "Create PHP Code" msgstr "建立 PHP 程式碼" -#: libraries/common.lib.php:1238 server_status.php:452 +#: libraries/common.lib.php:1235 server_status.php:452 #: setup/lib/messages.inc.php:354 msgid "Refresh" msgstr "更新" -#: libraries/common.lib.php:1247 +#: libraries/common.lib.php:1244 msgid "Skip Validate SQL" msgstr "略過檢查 SQL" -#: libraries/common.lib.php:1250 setup/lib/messages.inc.php:356 sql.php:527 +#: libraries/common.lib.php:1247 setup/lib/messages.inc.php:356 sql.php:518 msgid "Validate SQL" msgstr "檢查 SQL" -#: libraries/common.lib.php:1281 +#: libraries/common.lib.php:1278 msgid "Inline edit of this query" msgstr "" -#: libraries/common.lib.php:1283 +#: libraries/common.lib.php:1280 #, fuzzy #| msgid "Engines" msgid "Inline" msgstr "引擎" -#: libraries/common.lib.php:1343 libraries/common.lib.php:1358 +#: libraries/common.lib.php:1334 libraries/common.lib.php:1349 msgid "Profiling" msgstr "" -#: libraries/common.lib.php:1362 libraries/tbl_triggers.lib.php:28 +#: libraries/common.lib.php:1353 libraries/tbl_triggers.lib.php:28 #: server_processlist.php:58 msgid "Time" msgstr "時間" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "B" msgstr "Bytes" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "KiB" msgstr "KB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "MiB" msgstr "MB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "GiB" msgstr "GB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "TiB" msgstr "TB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "PiB" msgstr "PB" -#: libraries/common.lib.php:1390 +#: libraries/common.lib.php:1381 msgid "EiB" msgstr "EB" #. l10n: Thousands separator -#: libraries/common.lib.php:1428 +#: libraries/common.lib.php:1419 msgid "," msgstr "," #. l10n: Decimal separator -#: libraries/common.lib.php:1430 +#: libraries/common.lib.php:1421 msgid "." msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string -#: libraries/common.lib.php:1607 +#: libraries/common.lib.php:1598 #: libraries/transformations/text_plain__dateformat.inc.php:34 msgid "%B %d, %Y at %I:%M %p" msgstr "%B %d, %Y, %I:%M %p" -#: libraries/common.lib.php:1920 +#: libraries/common.lib.php:1907 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s 日, %s 小時, %s 分鐘 %s 秒" -#: libraries/common.lib.php:2335 libraries/common.lib.php:2338 +#: libraries/common.lib.php:2322 libraries/common.lib.php:2325 #: libraries/display_tbl.lib.php:290 server_status.php:719 msgid "Begin" msgstr "第一頁" -#: libraries/common.lib.php:2336 libraries/common.lib.php:2339 +#: libraries/common.lib.php:2323 libraries/common.lib.php:2326 #: libraries/display_tbl.lib.php:291 server_binlog.php:168 #: server_binlog.php:170 msgid "Previous" msgstr "前一頁" -#: libraries/common.lib.php:2367 libraries/common.lib.php:2370 +#: libraries/common.lib.php:2354 libraries/common.lib.php:2357 #: libraries/display_tbl.lib.php:353 msgid "End" msgstr "最後一頁" -#: libraries/common.lib.php:2443 +#: libraries/common.lib.php:2430 #, php-format msgid "Jump to database "%s"." msgstr "跳到資料庫 "%s"." -#: libraries/common.lib.php:2463 +#: libraries/common.lib.php:2450 #, php-format msgid "The %s functionality is affected by a known bug, see %s" msgstr "" -#: libraries/common.lib.php:2849 libraries/common.lib.php:2856 +#: libraries/common.lib.php:2830 libraries/common.lib.php:2837 #: libraries/db_links.inc.php:68 libraries/export/sql.php:25 -#: libraries/import/sql.php:18 libraries/server_links.inc.php:46 +#: libraries/import/sql.php:18 libraries/server_links.inc.php:45 #: libraries/tbl_links.inc.php:60 querywindow.php:99 test/theme.php:97 msgid "SQL" msgstr "SQL" -#: libraries/common.lib.php:2858 libraries/db_links.inc.php:104 +#: libraries/common.lib.php:2839 libraries/db_links.inc.php:104 #: libraries/tbl_links.inc.php:95 libraries/tbl_links.inc.php:117 #: view_operations.php:89 msgid "Operations" @@ -2091,7 +1877,7 @@ msgid "Events" msgstr "" #: libraries/db_events.inc.php:30 libraries/db_routines.inc.php:41 -#: libraries/display_create_table.lib.php:52 libraries/tbl_triggers.lib.php:27 +#: libraries/display_create_table.lib.php:53 libraries/tbl_triggers.lib.php:27 #: setup/frames/index.inc.php:112 msgid "Name" msgstr "名稱" @@ -2119,15 +1905,15 @@ msgstr "依範例查詢 (QBE)" msgid "Designer" msgstr "" -#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:89 +#: libraries/db_links.inc.php:98 libraries/server_links.inc.php:88 #: libraries/tbl_links.inc.php:91 pmd_pdf.php:84 pmd_pdf.php:110 #: setup/frames/menu.inc.php:21 msgid "Import" msgstr "載入" -#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:67 -#: server_privileges.php:112 server_privileges.php:1744 -#: server_privileges.php:2094 test/theme.php:117 +#: libraries/db_links.inc.php:111 libraries/server_links.inc.php:66 +#: server_privileges.php:111 server_privileges.php:1722 +#: server_privileges.php:2071 test/theme.php:117 msgid "Privileges" msgstr "權限" @@ -2146,11 +1932,7 @@ msgid "" msgstr "可能接近. 請參看 FAQ 3.11" #: libraries/db_structure.lib.php:69 server_databases.php:142 -<<<<<<< HEAD -#: tbl_printview.php:335 tbl_structure.php:680 -======= #: tbl_printview.php:335 tbl_structure.php:682 ->>>>>>> origin/master msgid "Overhead" msgstr "多餘" @@ -2167,7 +1949,7 @@ msgstr "伺服器並無回應" msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "( 或者本機 MySQL 伺服器之 socket 並未正確設定)" -#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:606 +#: libraries/dbi/mysql.dbi.lib.php:362 tbl_structure.php:608 msgid "Details..." msgstr "" @@ -2177,36 +1959,22 @@ msgid "Change password" msgstr "更改密碼" #: libraries/display_change_password.lib.php:35 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:348 server_privileges.php:808 -======= #: libraries/replication_gui.lib.php:348 server_privileges.php:807 ->>>>>>> origin/master msgid "No Password" msgstr "不用密碼" #: libraries/display_change_password.lib.php:41 #: libraries/replication_gui.lib.php:62 libraries/replication_gui.lib.php:63 #: libraries/replication_gui.lib.php:338 libraries/replication_gui.lib.php:342 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:352 server_privileges.php:797 -#: server_privileges.php:801 server_privileges.php:812 -#: server_privileges.php:1555 server_synchronize.php:1175 -======= #: libraries/replication_gui.lib.php:352 server_privileges.php:796 #: server_privileges.php:800 server_privileges.php:811 #: server_privileges.php:1538 server_synchronize.php:1175 ->>>>>>> origin/master msgid "Password" msgstr "密碼" #: libraries/display_change_password.lib.php:46 #: libraries/replication_gui.lib.php:356 libraries/replication_gui.lib.php:359 -<<<<<<< HEAD -#: server_privileges.php:816 server_privileges.php:819 -======= #: server_privileges.php:815 server_privileges.php:818 ->>>>>>> origin/master msgid "Re-type" msgstr "確認密碼" @@ -2221,20 +1989,12 @@ msgid "MySQL 4.0 compatible" msgstr "MySQL 4.0 相容" #: libraries/display_change_password.lib.php:72 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:363 server_privileges.php:823 -======= #: libraries/replication_gui.lib.php:363 server_privileges.php:822 ->>>>>>> origin/master msgid "Generate Password" msgstr "產生密碼" #: libraries/display_change_password.lib.php:75 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:366 server_privileges.php:826 -======= #: libraries/replication_gui.lib.php:366 server_privileges.php:825 ->>>>>>> origin/master msgid "Generate" msgstr "產生" @@ -2247,17 +2007,23 @@ msgstr "建立新資料庫" msgid "Create" msgstr "建立" -#: libraries/display_create_database.lib.php:40 server_privileges.php:114 -#: server_privileges.php:1441 server_replication.php:35 +#: libraries/display_create_database.lib.php:40 server_privileges.php:113 +#: server_privileges.php:1427 server_replication.php:35 msgid "No Privileges" msgstr "沒有權限" -#: libraries/display_create_table.lib.php:47 +#: libraries/display_create_table.lib.php:41 +#, fuzzy +#| msgid "Table must have at least one field." +msgid "Table must have at least one column." +msgstr "資料表最少需要有一個欄位." + +#: libraries/display_create_table.lib.php:48 #, php-format msgid "Create table on database %s" msgstr "建立新資料表於資料庫 %s" -#: libraries/display_create_table.lib.php:56 +#: libraries/display_create_table.lib.php:57 #, fuzzy #| msgid "Number of fields" msgid "Number of columns" @@ -2320,11 +2086,7 @@ msgid "remember template" msgstr "保留樣式名稱" #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177 -<<<<<<< HEAD -#: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:552 -======= #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549 ->>>>>>> origin/master msgid "Character set of the file:" msgstr "文字編碼檔案:" @@ -2335,7 +2097,7 @@ msgstr "壓縮" #: libraries/display_export.lib.php:240 libraries/display_import.lib.php:196 #: libraries/display_import.lib.php:209 libraries/display_tbl.lib.php:530 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 -#: server_privileges.php:1897 server_processlist.php:75 +#: server_privileges.php:1875 server_processlist.php:75 msgid "None" msgstr "不適用" @@ -2377,11 +2139,7 @@ msgstr "" msgid "File to import" msgstr "載入檔案" -<<<<<<< HEAD -#: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:527 -======= #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:524 ->>>>>>> origin/master msgid "Location of the text file" msgstr "文字檔案的位置" @@ -2389,20 +2147,12 @@ msgstr "文字檔案的位置" msgid "File uploads are not allowed on this server." msgstr "" -<<<<<<< HEAD -#: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:536 -======= #: libraries/display_import.lib.php:162 libraries/sql_query_form.lib.php:533 ->>>>>>> origin/master #: tbl_change.php:1025 msgid "The directory you set for upload work cannot be reached" msgstr "設定之上載目錄錯誤，未能使用" -<<<<<<< HEAD -#: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:539 -======= #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536 ->>>>>>> origin/master #: tbl_change.php:1028 msgid "web server upload directory" msgstr "Web 伺服器上載目錄" @@ -2533,11 +2283,7 @@ msgstr "依鍵名排序" #: libraries/import/docsql.php:34 libraries/import/ldi.php:47 #: libraries/import/ods.php:30 libraries/import/sql.php:20 #: libraries/import/xls.php:26 libraries/import/xlsx.php:26 -<<<<<<< HEAD -#: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:751 -======= #: libraries/import/xml.php:25 tbl_select.php:265 tbl_structure.php:753 ->>>>>>> origin/master #, fuzzy msgid "Options" msgstr "管理" @@ -2609,14 +2355,14 @@ msgstr "顯示記錄" msgid "total" msgstr "總計" -#: libraries/display_tbl.lib.php:1970 sql.php:533 +#: libraries/display_tbl.lib.php:1970 sql.php:524 #, php-format msgid "Query took %01.4f sec" msgstr "查詢需時 %01.4f 秒" #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113 #: querywindow.php:125 querywindow.php:129 querywindow.php:132 -#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:468 +#: tbl_structure.php:25 tbl_structure.php:150 tbl_structure.php:470 msgid "Change" msgstr "修改" @@ -2682,11 +2428,7 @@ msgstr "緩衝區使用空間" #: libraries/engines/innodb.lib.php:194 server_databases.php:137 #: server_databases.php:305 server_status.php:525 server_status.php:586 -<<<<<<< HEAD -#: server_status.php:607 tbl_printview.php:350 tbl_structure.php:694 -======= #: server_status.php:607 tbl_printview.php:350 tbl_structure.php:696 ->>>>>>> origin/master msgid "Total" msgstr "總共" @@ -2941,11 +2683,7 @@ msgid "" msgstr "" #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 -<<<<<<< HEAD -#: tbl_printview.php:375 tbl_structure.php:735 -======= #: tbl_printview.php:375 tbl_structure.php:737 ->>>>>>> origin/master msgid "Format" msgstr "格式" @@ -3017,13 +2755,8 @@ msgstr "Microsoft Word 2000" #: libraries/export/latex.php:201 libraries/export/odt.php:48 #: libraries/export/sql.php:106 libraries/export/sql.php:868 #: libraries/export/texytext.php:27 server_databases.php:127 -<<<<<<< HEAD -#: server_privileges.php:577 server_replication.php:316 tbl_printview.php:316 -#: tbl_structure.php:663 -======= #: server_privileges.php:576 server_replication.php:316 tbl_printview.php:316 #: tbl_structure.php:665 ->>>>>>> origin/master msgid "Data" msgstr "資料" @@ -3072,15 +2805,9 @@ msgstr "MIME 類型" #: libraries/export/xml.php:102 libraries/header_printview.inc.php:57 #: libraries/replication_gui.lib.php:66 libraries/replication_gui.lib.php:177 #: libraries/replication_gui.lib.php:272 libraries/replication_gui.lib.php:275 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:332 server_privileges.php:732 -#: server_privileges.php:735 server_privileges.php:791 -#: server_privileges.php:1554 server_privileges.php:2092 -======= #: libraries/replication_gui.lib.php:332 server_privileges.php:731 #: server_privileges.php:734 server_privileges.php:790 #: server_privileges.php:1537 server_privileges.php:2069 ->>>>>>> origin/master #: server_processlist.php:55 server_synchronize.php:1159 msgid "Host" msgstr "主機" @@ -3280,7 +3007,7 @@ msgstr "" msgid "Open new phpMyAdmin window" msgstr "開啟新 phpMyAdmin 視窗" -#: libraries/header.inc.php:119 +#: libraries/header.inc.php:115 #, fuzzy msgid "New table" msgstr "沒有資料表" @@ -3293,7 +3020,7 @@ msgstr "SQL 查詢結果" msgid "Generated by" msgstr "建立" -#: libraries/import.lib.php:152 sql.php:529 tbl_change.php:181 +#: libraries/import.lib.php:152 sql.php:520 tbl_change.php:181 #: tbl_get_field.php:35 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL 傳回的查詢結果為空 (原因可能為：沒有找到符合條件的記錄)" @@ -3443,20 +3170,20 @@ msgstr "" #: libraries/mult_submits.inc.php:76 libraries/tbl_properties.inc.php:513 #: tbl_structure.php:29 tbl_structure.php:153 tbl_structure.php:157 -#: tbl_structure.php:471 +#: tbl_structure.php:473 msgid "Primary" msgstr "主鍵 PRIMARY" #: libraries/mult_submits.inc.php:98 libraries/tbl_properties.inc.php:116 #: libraries/tbl_properties.inc.php:525 tbl_printview.php:325 #: tbl_structure.php:31 tbl_structure.php:154 tbl_structure.php:158 -#: tbl_structure.php:473 tbl_structure.php:671 +#: tbl_structure.php:475 tbl_structure.php:673 msgid "Index" msgstr "索引鍵 INDEX" #: libraries/mult_submits.inc.php:108 libraries/tbl_properties.inc.php:531 #: tbl_structure.php:35 tbl_structure.php:156 tbl_structure.php:160 -#: tbl_structure.php:476 +#: tbl_structure.php:478 msgid "Fulltext" msgstr "全文檢索" @@ -3681,6 +3408,10 @@ msgstr "這種格式並無選項" msgid "not OK" msgstr "未能確定" +#: libraries/relation.lib.php:99 pmd_general.php:340 +msgid "OK" +msgstr "確定" + #: libraries/relation.lib.php:100 msgid "Enabled" msgstr "啟動" @@ -3702,7 +3433,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "請參看說明文件查詢如何更新 Column_comments 資料表" -#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:436 +#: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" msgstr "SQL 語法書籤" @@ -3753,13 +3484,8 @@ msgstr "" #: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59 #: libraries/replication_gui.lib.php:252 libraries/replication_gui.lib.php:255 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:262 server_privileges.php:712 -#: server_privileges.php:715 server_privileges.php:722 -======= #: libraries/replication_gui.lib.php:262 server_privileges.php:711 #: server_privileges.php:714 server_privileges.php:721 ->>>>>>> origin/master #: server_synchronize.php:1171 msgid "User name" msgstr "使用者名稱" @@ -3778,22 +3504,14 @@ msgstr "" msgid "Slave status" msgstr "顯示 slave 狀態" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:448 -======= #: libraries/replication_gui.lib.php:117 libraries/sql_query_form.lib.php:445 ->>>>>>> origin/master #: server_status.php:737 server_variables.php:52 msgid "Variable" msgstr "資訊" #: libraries/replication_gui.lib.php:118 server_status.php:738 #: tbl_change.php:323 tbl_printview.php:369 tbl_select.php:138 -<<<<<<< HEAD -#: tbl_structure.php:727 -======= #: tbl_structure.php:729 ->>>>>>> origin/master msgid "Value" msgstr "值" @@ -3811,40 +3529,11 @@ msgstr "" msgid "Add slave replication user" msgstr "" -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:257 server_privileges.php:717 -======= #: libraries/replication_gui.lib.php:257 server_privileges.php:716 ->>>>>>> origin/master msgid "Any user" msgstr "任何使用者" #: libraries/replication_gui.lib.php:258 libraries/replication_gui.lib.php:326 -<<<<<<< HEAD -#: libraries/replication_gui.lib.php:349 server_privileges.php:718 -#: server_privileges.php:785 server_privileges.php:809 -#: server_privileges.php:1950 server_privileges.php:1980 -msgid "Use text field" -msgstr "文字輸入" - -#: libraries/replication_gui.lib.php:305 server_privileges.php:765 -msgid "Any host" -msgstr "任何主機" - -#: libraries/replication_gui.lib.php:309 server_privileges.php:769 -msgid "Local" -msgstr "本地" - -#: libraries/replication_gui.lib.php:315 server_privileges.php:774 -msgid "This Host" -msgstr "指定主機" - -#: libraries/replication_gui.lib.php:321 server_privileges.php:780 -msgid "Use Host Table" -msgstr "使用主機資料表" - -#: libraries/replication_gui.lib.php:334 server_privileges.php:793 -======= #: libraries/replication_gui.lib.php:349 server_privileges.php:717 #: server_privileges.php:784 server_privileges.php:808 #: server_privileges.php:1928 server_privileges.php:1958 @@ -3868,7 +3557,6 @@ msgid "Use Host Table" msgstr "使用主機資料表" #: libraries/replication_gui.lib.php:334 server_privileges.php:792 ->>>>>>> origin/master msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -3903,29 +3591,29 @@ msgstr "不知名語言: %1$s." msgid "Servers" msgstr "伺服器" -#: libraries/server_links.inc.php:54 server_engines.php:112 +#: libraries/server_links.inc.php:53 server_engines.php:112 #: server_engines.php:116 server_status.php:415 test/theme.php:105 msgid "Variables" msgstr "資訊" -#: libraries/server_links.inc.php:58 test/theme.php:109 +#: libraries/server_links.inc.php:57 test/theme.php:109 msgid "Charsets" msgstr "文字編碼" -#: libraries/server_links.inc.php:62 test/theme.php:113 +#: libraries/server_links.inc.php:61 test/theme.php:113 msgid "Engines" msgstr "引擎" -#: libraries/server_links.inc.php:77 server_binlog.php:110 +#: libraries/server_links.inc.php:76 server_binlog.php:110 #: server_status.php:364 test/theme.php:121 msgid "Binary log" msgstr "二進制記錄" -#: libraries/server_links.inc.php:81 +#: libraries/server_links.inc.php:80 msgid "Processes" msgstr "處理" -#: libraries/server_links.inc.php:93 server_synchronize.php:1092 +#: libraries/server_links.inc.php:92 server_synchronize.php:1092 #: server_synchronize.php:1100 msgid "Synchronize" msgstr "" @@ -3954,51 +3642,51 @@ msgstr "" msgid "Target database" msgstr "搜索資料庫" -#: libraries/sql_query_form.lib.php:226 +#: libraries/sql_query_form.lib.php:223 #, php-format msgid "Run SQL query/queries on server %s" msgstr "於伺服器 %s 執行 SQL 語法" -#: libraries/sql_query_form.lib.php:243 libraries/sql_query_form.lib.php:268 +#: libraries/sql_query_form.lib.php:240 libraries/sql_query_form.lib.php:265 #, php-format msgid "Run SQL query/queries on database %s" msgstr "在資料庫 %s 執行以下指令" -#: libraries/sql_query_form.lib.php:320 +#: libraries/sql_query_form.lib.php:317 #, fuzzy #| msgid "Column names" msgid "Columns" msgstr "欄位名稱" -#: libraries/sql_query_form.lib.php:355 sql.php:693 sql.php:694 sql.php:711 +#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" msgstr "將此 SQL 語法加入書籤" -#: libraries/sql_query_form.lib.php:362 sql.php:705 +#: libraries/sql_query_form.lib.php:359 sql.php:677 msgid "Let every user access this bookmark" msgstr "所有用者可讀取此書籤" -#: libraries/sql_query_form.lib.php:368 +#: libraries/sql_query_form.lib.php:365 msgid "Replace existing bookmark of same name" msgstr "取代相同名稱之書籤" -#: libraries/sql_query_form.lib.php:384 +#: libraries/sql_query_form.lib.php:381 msgid "Do not overwrite this query from outside the window" msgstr "不要將這語法覆蓋到本視窗外的SQL語法" -#: libraries/sql_query_form.lib.php:391 +#: libraries/sql_query_form.lib.php:388 msgid "Delimiter" msgstr "" -#: libraries/sql_query_form.lib.php:399 +#: libraries/sql_query_form.lib.php:396 msgid " Show this query here again " msgstr "重新顯示 SQL 語法 " -#: libraries/sql_query_form.lib.php:465 +#: libraries/sql_query_form.lib.php:462 msgid "Submit" msgstr "送出" -#: libraries/sql_query_form.lib.php:469 +#: libraries/sql_query_form.lib.php:466 msgid "View only" msgstr "查看" @@ -4161,13 +3849,13 @@ msgstr "" msgid "Save" msgstr "儲存" -#: libraries/tbl_properties.inc.php:780 tbl_structure.php:540 +#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 #, fuzzy, php-format #| msgid "Add %s field(s)" msgid "Add %s column(s)" msgstr "新增 %s 個欄位" -#: libraries/tbl_properties.inc.php:784 tbl_structure.php:534 +#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 #, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." @@ -4350,8 +4038,8 @@ msgstr "重設" msgid "Protocol version" msgstr "通訊協定版本" -#: main.php:189 server_privileges.php:1400 server_privileges.php:1553 -#: server_privileges.php:1672 server_privileges.php:2091 +#: main.php:189 server_privileges.php:1389 server_privileges.php:1536 +#: server_privileges.php:1650 server_privileges.php:2068 #: server_processlist.php:54 msgid "User" msgstr "使用者" @@ -4785,168 +4473,168 @@ msgstr "儲存引擎" msgid "View dump (schema) of databases" msgstr "顯示資料庫概要 (schema)" -#: server_privileges.php:25 server_privileges.php:267 +#: server_privileges.php:24 server_privileges.php:266 msgid "Includes all privileges except GRANT." msgstr "包括所有權限除了授權 (GRNANT)." -#: server_privileges.php:26 server_privileges.php:193 -#: server_privileges.php:516 +#: server_privileges.php:25 server_privileges.php:192 +#: server_privileges.php:515 msgid "Allows altering the structure of existing tables." msgstr "容許修改現有資料表的結構." -#: server_privileges.php:27 server_privileges.php:209 -#: server_privileges.php:522 +#: server_privileges.php:26 server_privileges.php:208 +#: server_privileges.php:521 msgid "Allows altering and dropping stored routines." msgstr "容許修改及刪除儲存程序." -#: server_privileges.php:28 server_privileges.php:185 -#: server_privileges.php:515 +#: server_privileges.php:27 server_privileges.php:184 +#: server_privileges.php:514 msgid "Allows creating new databases and tables." msgstr "容許建立新資料庫及資料表." -#: server_privileges.php:29 server_privileges.php:208 -#: server_privileges.php:521 +#: server_privileges.php:28 server_privileges.php:207 +#: server_privileges.php:520 msgid "Allows creating stored routines." msgstr "容許建立儲存程序" -#: server_privileges.php:30 server_privileges.php:515 +#: server_privileges.php:29 server_privileges.php:514 msgid "Allows creating new tables." msgstr "容許建立新資料表." -#: server_privileges.php:31 server_privileges.php:196 -#: server_privileges.php:519 +#: server_privileges.php:30 server_privileges.php:195 +#: server_privileges.php:518 msgid "Allows creating temporary tables." msgstr "容許建立暫時性資料表." -#: server_privileges.php:32 server_privileges.php:210 -#: server_privileges.php:555 +#: server_privileges.php:31 server_privileges.php:209 +#: server_privileges.php:554 msgid "Allows creating, dropping and renaming user accounts." msgstr "容許建立、刪除及重新命名使用者戶口." -#: server_privileges.php:33 server_privileges.php:200 -#: server_privileges.php:204 server_privileges.php:527 -#: server_privileges.php:531 +#: server_privileges.php:32 server_privileges.php:199 +#: server_privileges.php:203 server_privileges.php:526 +#: server_privileges.php:530 msgid "Allows creating new views." msgstr "容許建立新的檢視." -#: server_privileges.php:34 server_privileges.php:184 -#: server_privileges.php:507 +#: server_privileges.php:33 server_privileges.php:183 +#: server_privileges.php:506 msgid "Allows deleting data." msgstr "容許刪除記錄." -#: server_privileges.php:35 server_privileges.php:186 -#: server_privileges.php:518 +#: server_privileges.php:34 server_privileges.php:185 +#: server_privileges.php:517 msgid "Allows dropping databases and tables." msgstr "容許刪除資料庫及資料表." -#: server_privileges.php:36 server_privileges.php:518 +#: server_privileges.php:35 server_privileges.php:517 msgid "Allows dropping tables." msgstr "容許刪除資料表." -#: server_privileges.php:37 server_privileges.php:201 -#: server_privileges.php:535 +#: server_privileges.php:36 server_privileges.php:200 +#: server_privileges.php:534 msgid "Allows to set up events for the event scheduler" msgstr "" -#: server_privileges.php:38 server_privileges.php:211 -#: server_privileges.php:523 +#: server_privileges.php:37 server_privileges.php:210 +#: server_privileges.php:522 msgid "Allows executing stored routines." msgstr "容許執行儲存程序." -#: server_privileges.php:39 server_privileges.php:190 -#: server_privileges.php:510 +#: server_privileges.php:38 server_privileges.php:189 +#: server_privileges.php:509 msgid "Allows importing data from and exporting data into files." msgstr "容許輸入及輸出數據到檔案." -#: server_privileges.php:40 server_privileges.php:541 +#: server_privileges.php:39 server_privileges.php:540 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "容許新增使用者及權限而無需重新讀取權限資料表." -#: server_privileges.php:41 server_privileges.php:192 -#: server_privileges.php:517 +#: server_privileges.php:40 server_privileges.php:191 +#: server_privileges.php:516 msgid "Allows creating and dropping indexes." msgstr "容許建立及刪除索引." -#: server_privileges.php:42 server_privileges.php:182 -#: server_privileges.php:443 server_privileges.php:505 +#: server_privileges.php:41 server_privileges.php:181 +#: server_privileges.php:442 server_privileges.php:504 msgid "Allows inserting and replacing data." msgstr "容許新增及取代數據." -#: server_privileges.php:43 server_privileges.php:197 -#: server_privileges.php:550 +#: server_privileges.php:42 server_privileges.php:196 +#: server_privileges.php:549 msgid "Allows locking tables for the current thread." msgstr "容許鎖上現時連線之資料表." -#: server_privileges.php:44 server_privileges.php:647 -#: server_privileges.php:649 +#: server_privileges.php:43 server_privileges.php:646 +#: server_privileges.php:648 msgid "Limits the number of new connections the user may open per hour." msgstr "限制每小時使用者開啟新連線的數目." -#: server_privileges.php:45 server_privileges.php:635 -#: server_privileges.php:637 +#: server_privileges.php:44 server_privileges.php:634 +#: server_privileges.php:636 msgid "Limits the number of queries the user may send to the server per hour." msgstr "限制每小時使用者查詢的數目." -#: server_privileges.php:46 server_privileges.php:641 -#: server_privileges.php:643 +#: server_privileges.php:45 server_privileges.php:640 +#: server_privileges.php:642 msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." msgstr "限制每小時使用者更改資料表及數據表之指令的數目." -#: server_privileges.php:47 server_privileges.php:653 -#: server_privileges.php:655 +#: server_privileges.php:46 server_privileges.php:652 +#: server_privileges.php:654 msgid "Limits the number of simultaneous connections the user may have." msgstr "限制每個使用者之同步連線." -#: server_privileges.php:48 server_privileges.php:189 -#: server_privileges.php:545 +#: server_privileges.php:47 server_privileges.php:188 +#: server_privileges.php:544 msgid "Allows viewing processes of all users" msgstr "" -#: server_privileges.php:49 server_privileges.php:191 -#: server_privileges.php:449 server_privileges.php:551 +#: server_privileges.php:48 server_privileges.php:190 +#: server_privileges.php:448 server_privileges.php:550 msgid "Has no effect in this MySQL version." msgstr "於本 MySQL 版本無效." -#: server_privileges.php:50 server_privileges.php:187 -#: server_privileges.php:546 +#: server_privileges.php:49 server_privileges.php:186 +#: server_privileges.php:545 msgid "Allows reloading server settings and flushing the server's caches." msgstr "容許重新讀取伺服器設定及強行更新伺服器快取記憶." -#: server_privileges.php:51 server_privileges.php:199 -#: server_privileges.php:553 +#: server_privileges.php:50 server_privileges.php:198 +#: server_privileges.php:552 msgid "Allows the user to ask where the slaves / masters are." msgstr "容許用戶查詢 slaves / masters 在何處." -#: server_privileges.php:52 server_privileges.php:198 -#: server_privileges.php:554 +#: server_privileges.php:51 server_privileges.php:197 +#: server_privileges.php:553 msgid "Needed for the replication slaves." msgstr "需要複製的 slaves." -#: server_privileges.php:53 server_privileges.php:181 -#: server_privileges.php:440 server_privileges.php:504 +#: server_privileges.php:52 server_privileges.php:180 +#: server_privileges.php:439 server_privileges.php:503 msgid "Allows reading data." msgstr "容許讀取數據." -#: server_privileges.php:54 server_privileges.php:194 -#: server_privileges.php:548 +#: server_privileges.php:53 server_privileges.php:193 +#: server_privileges.php:547 msgid "Gives access to the complete list of databases." msgstr "可讀取整個資料庫清單." -#: server_privileges.php:55 server_privileges.php:205 -#: server_privileges.php:207 server_privileges.php:520 +#: server_privileges.php:54 server_privileges.php:204 +#: server_privileges.php:206 server_privileges.php:519 msgid "Allows performing SHOW CREATE VIEW queries." msgstr "容許執行 SHOW CREATE VIEW 查詢." -#: server_privileges.php:56 server_privileges.php:188 -#: server_privileges.php:547 +#: server_privileges.php:55 server_privileges.php:187 +#: server_privileges.php:546 msgid "Allows shutting down the server." msgstr "容許停止伺服器." -#: server_privileges.php:57 server_privileges.php:195 -#: server_privileges.php:544 +#: server_privileges.php:56 server_privileges.php:194 +#: server_privileges.php:543 msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " @@ -4955,157 +4643,157 @@ msgstr "" "容許連線, 就算超過了最大連線限制; 用於最高系統管理如設定整體權限或中止其他使" "用者指令." -#: server_privileges.php:58 server_privileges.php:202 -#: server_privileges.php:536 +#: server_privileges.php:57 server_privileges.php:201 +#: server_privileges.php:535 #, fuzzy msgid "Allows creating and dropping triggers" msgstr "容許建立及刪除索引." -#: server_privileges.php:59 server_privileges.php:183 -#: server_privileges.php:446 server_privileges.php:506 +#: server_privileges.php:58 server_privileges.php:182 +#: server_privileges.php:445 server_privileges.php:505 msgid "Allows changing data." msgstr "容許更新數據." -#: server_privileges.php:60 server_privileges.php:261 +#: server_privileges.php:59 server_privileges.php:260 msgid "No privileges." msgstr "沒有權限." -#: server_privileges.php:303 server_privileges.php:304 +#: server_privileges.php:302 server_privileges.php:303 #, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" msgstr "不適用" -#: server_privileges.php:432 server_privileges.php:567 -#: server_privileges.php:1740 server_privileges.php:1746 +#: server_privileges.php:431 server_privileges.php:566 +#: server_privileges.php:1718 server_privileges.php:1724 msgid "Table-specific privileges" msgstr "指定資料表權限" -#: server_privileges.php:433 server_privileges.php:575 -#: server_privileges.php:1557 +#: server_privileges.php:432 server_privileges.php:574 +#: server_privileges.php:1540 msgid " Note: MySQL privilege names are expressed in English " msgstr "注意: MySQL 權限名稱會以英語顯示" -#: server_privileges.php:564 server_privileges.php:1556 +#: server_privileges.php:563 server_privileges.php:1539 msgid "Global privileges" msgstr "整體權限" -#: server_privileges.php:566 server_privileges.php:1740 +#: server_privileges.php:565 server_privileges.php:1718 msgid "Database-specific privileges" msgstr "指定資料庫權限" -#: server_privileges.php:611 +#: server_privileges.php:610 msgid "Administration" msgstr "系統管理" -#: server_privileges.php:631 +#: server_privileges.php:630 msgid "Resource limits" msgstr "資源限制" -#: server_privileges.php:632 +#: server_privileges.php:631 msgid "Note: Setting these options to 0 (zero) removes the limit." msgstr "註: 設定這些選項為 0 (零) 可解除限制." -#: server_privileges.php:709 +#: server_privileges.php:708 msgid "Login Information" msgstr "登入資訊" -#: server_privileges.php:803 +#: server_privileges.php:802 msgid "Do not change the password" msgstr "請不要更改密碼" -#: server_privileges.php:844 server_privileges.php:2228 +#: server_privileges.php:843 server_privileges.php:2205 #, fuzzy #| msgid "No user(s) found." msgid "No user found." msgstr "找不到使用者" -#: server_privileges.php:888 +#: server_privileges.php:887 #, php-format msgid "The user %s already exists!" msgstr "使用者 %s 己存在!" -#: server_privileges.php:971 +#: server_privileges.php:970 msgid "You have added a new user." msgstr "您已新增了一個新使用者." -#: server_privileges.php:1192 +#: server_privileges.php:1191 #, php-format msgid "You have updated the privileges for %s." msgstr "您已經更新了 %s 的權限." -#: server_privileges.php:1216 +#: server_privileges.php:1215 #, php-format msgid "You have revoked the privileges for %s" msgstr "您已移除這位使用者的權限: %s" -#: server_privileges.php:1252 +#: server_privileges.php:1251 #, php-format msgid "The password for %s was changed successfully." msgstr "%s 的密碼已成功更改." -#: server_privileges.php:1272 +#: server_privileges.php:1271 #, php-format msgid "Deleting %s" msgstr "刪除 %s" -#: server_privileges.php:1283 +#: server_privileges.php:1282 msgid "No users selected for deleting!" msgstr "並未選擇需要刪除之使用者!" -#: server_privileges.php:1286 +#: server_privileges.php:1285 msgid "Reloading the privileges" msgstr "重新讀取權限" -#: server_privileges.php:1301 +#: server_privileges.php:1300 msgid "The selected users have been deleted successfully." msgstr "選擇的使用者已成功刪除." -#: server_privileges.php:1336 +#: server_privileges.php:1335 msgid "The privileges were reloaded successfully." msgstr "權限已成功重新讀取." -#: server_privileges.php:1374 server_privileges.php:1671 +#: server_privileges.php:1363 server_privileges.php:1649 msgid "Edit Privileges" msgstr "編輯權限" -#: server_privileges.php:1383 +#: server_privileges.php:1372 msgid "Revoke" msgstr "移除" -#: server_privileges.php:1418 +#: server_privileges.php:1404 msgid "User overview" msgstr "使用者一覽" -#: server_privileges.php:1558 server_privileges.php:1745 -#: server_privileges.php:2095 +#: server_privileges.php:1541 server_privileges.php:1723 +#: server_privileges.php:2072 msgid "Grant" msgstr "授權" -#: server_privileges.php:1577 server_privileges.php:2185 +#: server_privileges.php:1560 server_privileges.php:2162 msgid "Any" msgstr "任何" -#: server_privileges.php:1626 server_privileges.php:1650 -#: server_privileges.php:2050 server_privileges.php:2239 +#: server_privileges.php:1609 server_privileges.php:1633 +#: server_privileges.php:2027 server_privileges.php:2216 msgid "Add a new User" msgstr "新增使用者" -#: server_privileges.php:1631 +#: server_privileges.php:1614 msgid "Remove selected users" msgstr "移除已選擇使用者" -#: server_privileges.php:1634 +#: server_privileges.php:1617 msgid "Revoke all active privileges from the users and delete them afterwards." msgstr "廢除使用者所有有效之權限並刪除." -#: server_privileges.php:1635 server_privileges.php:1636 -#: server_privileges.php:1637 +#: server_privileges.php:1618 server_privileges.php:1619 +#: server_privileges.php:1620 msgid "Drop the databases that have the same names as the users." msgstr "刪除與使用者相同名稱之資料庫." -#: server_privileges.php:1658 +#: server_privileges.php:1636 #, php-format msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " @@ -5117,91 +4805,91 @@ msgstr "" "表, 資料表內容將可能與實際使用者情況有異. 在這情況下, 您應在繼續前 %s重新載" "入%s 權限資料表." -#: server_privileges.php:1706 +#: server_privileges.php:1684 msgid "The selected user was not found in the privilege table." msgstr "選擇的使用者在權限資料表內找不到." -#: server_privileges.php:1746 +#: server_privileges.php:1724 msgid "Column-specific privileges" msgstr "指定欄位權限" -#: server_privileges.php:1947 +#: server_privileges.php:1925 msgid "Add privileges on the following database" msgstr "於以下資料庫加入權限" -#: server_privileges.php:1965 +#: server_privileges.php:1943 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "萬用符號 _ 及 % 應正確地加入 \\ " -#: server_privileges.php:1968 +#: server_privileges.php:1946 msgid "Add privileges on the following table" msgstr "於以下資料表加入權限" -#: server_privileges.php:2025 +#: server_privileges.php:2003 msgid "Change Login Information / Copy User" msgstr "更改登入資訊 / 複製使用者" -#: server_privileges.php:2028 +#: server_privileges.php:2006 msgid "Create a new user with the same privileges and ..." msgstr "建立新使用者及使用相同之權限, 及 ..." -#: server_privileges.php:2030 +#: server_privileges.php:2008 msgid "... keep the old one." msgstr "... 保留舊使用者." -#: server_privileges.php:2031 +#: server_privileges.php:2009 msgid " ... delete the old one from the user tables." msgstr " ... 刪除舊使用者." -#: server_privileges.php:2032 +#: server_privileges.php:2010 msgid "" " ... revoke all active privileges from the old one and delete it afterwards." msgstr " ... 廢除所有舊使用者有效之權限並刪除." -#: server_privileges.php:2033 +#: server_privileges.php:2011 msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." msgstr " ... 刪除舊使用者及重新讀取權限資料表." -#: server_privileges.php:2056 +#: server_privileges.php:2033 msgid "Database for user" msgstr "" -#: server_privileges.php:2060 +#: server_privileges.php:2037 #, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" msgstr "不適用" -#: server_privileges.php:2061 +#: server_privileges.php:2038 msgid "Create database with same name and grant all privileges" msgstr "" -#: server_privileges.php:2062 +#: server_privileges.php:2039 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -#: server_privileges.php:2065 +#: server_privileges.php:2042 #, fuzzy, php-format msgid "Grant all privileges on database "%s"" msgstr "查詢資料庫 "%s" 之權限." -#: server_privileges.php:2088 +#: server_privileges.php:2065 #, php-format msgid "Users having access to "%s"" msgstr "可讀取 "%s" 之使用者" -#: server_privileges.php:2196 +#: server_privileges.php:2173 msgid "global" msgstr "整體" -#: server_privileges.php:2198 +#: server_privileges.php:2175 msgid "database-specific" msgstr "指定資料庫" -#: server_privileges.php:2200 +#: server_privileges.php:2177 msgid "wildcard" msgstr "萬用字元" @@ -7821,25 +7509,25 @@ msgstr "" msgid "ZIP" msgstr "" -#: sql.php:505 tbl_replace.php:386 +#: sql.php:496 tbl_replace.php:386 #, php-format msgid "Inserted row id: %1$d" msgstr "" -#: sql.php:522 +#: sql.php:513 msgid "Showing as PHP code" msgstr "" -#: sql.php:525 tbl_replace.php:360 +#: sql.php:516 tbl_replace.php:360 msgid "Showing SQL query" msgstr "" -#: sql.php:667 +#: sql.php:639 #, php-format msgid "Problems with indexes of table `%s`" msgstr "於資料表 `%s` 中有索引問題" -#: sql.php:699 +#: sql.php:671 msgid "Label" msgstr "書籤名稱" @@ -7891,13 +7579,6 @@ msgstr "" msgid "Show insert query" msgstr "" -<<<<<<< HEAD -#: tbl_change.php:1140 -msgid "and then" -msgstr "然後" - -======= ->>>>>>> origin/master #: tbl_change.php:1144 msgid "Go back to previous page" msgstr "返回" @@ -7976,7 +7657,7 @@ msgstr "(\"PRIMARY\" 必須是主鍵的名稱以及是唯一一組 msgid "Add to index  %s column(s)" msgstr "新增  %s  組索引欄" -#: tbl_indexes.php:256 tbl_structure.php:587 tbl_structure.php:598 +#: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." msgstr "欄位數目需要大於零." @@ -8093,41 +7774,6 @@ msgstr "檢查指示完整性:" msgid "Show tables" msgstr "顯示資料表" -<<<<<<< HEAD -#: tbl_printview.php:309 tbl_structure.php:654 -msgid "Space usage" -msgstr "已使用空間" - -#: tbl_printview.php:313 tbl_structure.php:658 -msgid "Usage" -msgstr "使用" - -#: tbl_printview.php:340 tbl_structure.php:685 -msgid "Effective" -msgstr "實際" - -#: tbl_printview.php:365 tbl_structure.php:723 -msgid "Row Statistics" -msgstr "資料列統計數值" - -#: tbl_printview.php:368 tbl_structure.php:726 -msgid "Statements" -msgstr "敘述" - -#: tbl_printview.php:379 tbl_structure.php:738 -msgid "static" -msgstr "" - -#: tbl_printview.php:381 tbl_structure.php:740 -msgid "dynamic" -msgstr "動態" - -#: tbl_printview.php:403 tbl_structure.php:783 -msgid "Row length" -msgstr "資料列長度" - -#: tbl_printview.php:413 tbl_structure.php:791 -======= #: tbl_printview.php:309 tbl_structure.php:656 msgid "Space usage" msgstr "已使用空間" @@ -8161,7 +7807,6 @@ msgid "Row length" msgstr "資料列長度" #: tbl_printview.php:413 tbl_structure.php:793 ->>>>>>> origin/master msgid " Row size " msgstr "資料列大小" @@ -8233,50 +7878,50 @@ msgstr "不適用" msgid "Column %s has been dropped" msgstr "資料表 %s 已被刪除" -#: tbl_structure.php:384 +#: tbl_structure.php:385 #, php-format msgid "A primary key has been added on %s" msgstr "主鍵已經新增到 %s" -#: tbl_structure.php:398 tbl_structure.php:412 tbl_structure.php:426 +#: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" msgstr "索引已經新增到 %s" -#: tbl_structure.php:504 tbl_structure.php:506 +#: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" msgstr "關聯檢視" -#: tbl_structure.php:513 tbl_structure.php:515 +#: tbl_structure.php:515 tbl_structure.php:517 msgid "Propose table structure" msgstr "分析資料表結構" -#: tbl_structure.php:538 +#: tbl_structure.php:540 #, fuzzy #| msgid "Add %s field(s)" msgid "Add column" msgstr "新增 %s 個欄位" -#: tbl_structure.php:552 +#: tbl_structure.php:554 msgid "At End of Table" msgstr "於資料表尾端" -#: tbl_structure.php:553 +#: tbl_structure.php:555 msgid "At Beginning of Table" msgstr "於資料表開頭" -#: tbl_structure.php:554 +#: tbl_structure.php:556 #, php-format msgid "After %s" msgstr "在 %s 之後" -#: tbl_structure.php:592 +#: tbl_structure.php:594 #, fuzzy, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" msgstr "新增  %s  組索引欄" -#: tbl_structure.php:754 +#: tbl_structure.php:756 msgid "partitioned" msgstr "" @@ -8318,6 +7963,10 @@ msgstr "" msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" +#: tbl_tracking.php:251 tbl_tracking.php:379 +msgid "Close" +msgstr "" + #: tbl_tracking.php:262 #, php-format msgid "Version %s snapshot (SQL code)" @@ -8683,6 +8332,10 @@ msgstr "將資料表改名為" #~ msgid "Process list" #~ msgstr "系統執行清單" +#, fuzzy +#~ msgid "Reload privileges" +#~ msgstr "整體權限" + #~ msgid "" #~ "The users will still have the USAGE privilege until the privileges are " #~ "reloaded."