Git June 2011

git@phpmyadmin.net

7 participants
281 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_4_3-38-gdfae6aa
by Marc Delisle 27 Jun '11

27 Jun '11

The branch, TESTING has been updated via dfae6aa3ee78806160113cb221ba1249d5b6fdf9 (commit) via 9fc6e35cfd1d8270d943f5577807a3c79f5c6168 (commit) via d3b67a35a0df4969273529501788c68b4fddcc24 (commit) via e21d6073e46d41afbf0a09ba9bd38cd19f37e968 (commit) via 79d924add8c5e2070f7ab0301e1c98ac42fee806 (commit) via 4bec3b3bee31a1bd88a176f8c1cd5033c970fece (commit) via 2c6666bf03c4a866d625955092fb1b4613e18f72 (commit) via 52269e0e56260280b82109e41573179d93676a5b (commit) via dc6c1e8b5cc0d2d116e000cba7752f60be248ffd (commit) via cb043f4365be9b8edec63188d339eda2154401fc (commit) from 666a207cd5e6b94cb3273832a009ae5ada7ef9a3 (commit) - Log ----------------------------------------------------------------- commit dfae6aa3ee78806160113cb221ba1249d5b6fdf9 Merge: 666a207cd5e6b94cb3273832a009ae5ada7ef9a3 9fc6e35cfd1d8270d943f5577807a3c79f5c6168 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 27 10:25:46 2011 -0400 Merge branch 'MAINT_3_4_3' into TESTING ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- Documentation.html | 4 +- README | 2 +- enum_editor.php | 4 +- import.php | 2 +- libraries/Config.class.php | 2 +- po/af.po | 2 +- po/ar.po | 423 ++++++++++++++++++++++-------------------- po/az.po | 2 +- po/be.po | 2 +- po/be(a)latin.po | 2 +- po/bg.po | 4 +- po/bn.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 6 +- po/de.po | 2 +- po/el.po | 2 +- po/en_GB.po | 2 +- po/es.po | 2 +- po/et.po | 2 +- po/eu.po | 2 +- po/fa.po | 2 +- po/fi.po | 6 +- po/fr.po | 2 +- po/gl.po | 2 +- po/he.po | 2 +- po/hi.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/id.po | 6 +- po/it.po | 2 +- po/ja.po | 2 +- po/ka.po | 2 +- po/ko.po | 2 +- po/lt.po | 2 +- po/lv.po | 2 +- po/mk.po | 2 +- po/ml.po | 2 +- po/mn.po | 2 +- po/ms.po | 2 +- po/nb.po | 2 +- po/nl.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/si.po | 2 +- po/sk.po | 2 +- po/sl.po | 2 +- po/sq.po | 2 +- po/sr.po | 2 +- po/sr(a)latin.po | 2 +- po/sv.po | 2 +- po/ta.po | 2 +- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/tt.po | 2 +- po/ug.po | 2 +- po/uk.po | 2 +- po/ur.po | 2 +- po/uz.po | 2 +- po/uz(a)latin.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- scripts/remove-incomplete-mo | 2 +- tbl_structure.php | 2 +- 71 files changed, 305 insertions(+), 276 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c14aeb..ee33037 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -3.4.3.0 (not yet released) +3.4.3.0 (2011-06-27) - bug #3311170 [sync] Missing helper icons in Synchronize - patch #3304473 [setup] Redefine a lable that was wrong - bug #3304544 [parser] master is not a reserved word diff --git a/Documentation.html b/Documentation.html index fb2a881..576c1f0 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.3-rc1 - Documentation</title> + <title>phpMyAdmin 3.4.3 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.3-rc1 + 3.4.3 Documentation </h1> </div> diff --git a/README b/README index 53a08eb..02ad016 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.3-rc1 +Version 3.4.3 A set of PHP-scripts to manage MySQL over the web. diff --git a/enum_editor.php b/enum_editor.php index 586e85e..ab86d73 100644 --- a/enum_editor.php +++ b/enum_editor.php @@ -53,11 +53,11 @@ require_once './libraries/header_meta_style.inc.php'; ?> </div> <p> - <a href="enum_editor.php?token=<?php echo urlencode($_GET['token']); ?>&field=<?php echo urlencode($_GET['field']); ?>&extra_fields=<?php echo $_GET['extra_fields'] + 1; ?>&values=<?php echo urlencode(join(",", $values)); ?>"> + <a href="enum_editor.php<?php echo PMA_generate_common_url(array('field' => $_GET['field'], 'extra_fields' => $_GET['extra_fields'] + 1, 'values' => join(',', $values))); ?>"> <?php echo __('+ Restart insertion and add a new value'); ?> </a> </p> - <input type="hidden" name="token" value="<?php echo htmlspecialchars($_GET['token']); ?>" /> + <?php echo PMA_generate_common_hidden_inputs(); ?> <input type="hidden" name="field" value="<?php echo htmlspecialchars($_GET['field']); ?>" /> <input type="hidden" name="num_fields" value="<?php echo $total_fields; ?>" /> <input type="submit" value="<?php echo __('Go'); ?>" /> diff --git a/import.php b/import.php index 78e5ffd..d706b60 100644 --- a/import.php +++ b/import.php @@ -108,7 +108,7 @@ if ($import_type == 'table') { } $err_url = $goto . '?' . $common - . (preg_match('@^tbl_[a-z]*\.php$@', $goto) ? '&table=' . urlencode($table) : ''); + . (preg_match('@^tbl_[a-z]*\.php$@', $goto) ? '&table=' . htmlspecialchars($table) : ''); $_SESSION['Import_message']['go_back_url'] = $err_url; } diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 7081f83..cd1a0bf 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.3-rc1'); + $this->set('PMA_VERSION', '3.4.3'); /** * @deprecated */ diff --git a/po/af.po b/po/af.po index f268ecc..bf28a23 100644 --- a/po/af.po +++ b/po/af.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-30 23:04+0200\n" diff --git a/po/ar.po b/po/ar.po index ec74776..c468cd2 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-21 13:56+0200\n" @@ -329,7 +329,7 @@ msgstr "أضف قيودا" #: db_operations.php:528 msgid "Switch to copied database" -msgstr "" +msgstr "التبديل إلى قاعدة البيانات المنسوخة" #: db_operations.php:552 libraries/Index.class.php:447 #: libraries/build_html_for_db.lib.php:19 libraries/db_structure.lib.php:53 @@ -421,11 +421,11 @@ msgstr "عليك اختيار عمود واحد على الأقل للعرض" #: db_qbe.php:186 msgid "Switch to" -msgstr "" +msgstr "تحويل إلى" #: db_qbe.php:186 msgid "visual builder" -msgstr "" +msgstr "الباني المرئي" #: db_qbe.php:222 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:858 @@ -621,7 +621,7 @@ msgstr "جدول %s أفرغت محتوياتها" #: db_structure.php:286 tbl_operations.php:701 #, php-format msgid "View %s has been dropped" -msgstr "" +msgstr "تم إزالة %s من العرض" #: db_structure.php:286 tbl_operations.php:701 #, php-format @@ -630,29 +630,29 @@ msgstr "جدول %s حذفت" #: db_structure.php:293 tbl_create.php:295 msgid "Tracking is active." -msgstr "" +msgstr "التتبع نشط." #: db_structure.php:295 tbl_create.php:297 msgid "Tracking is not active." -msgstr "" +msgstr "التتبع غير نشط." #: db_structure.php:379 libraries/display_tbl.lib.php:2043 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation" "%s." -msgstr "" +msgstr "هذا العرض له ما لا يقل عدد هذه الصفوف يرجى الرجوع إلى %s الوثيقة %s" #: db_structure.php:393 db_structure.php:407 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:206 test/theme.php:73 msgid "View" -msgstr "" +msgstr "عرض" #: db_structure.php:444 libraries/db_structure.lib.php:40 #: libraries/server_links.inc.php:90 server_replication.php:31 #: server_replication.php:162 server_status.php:383 msgid "Replication" -msgstr "" +msgstr "إستنساخ" #: db_structure.php:448 msgid "Sum" @@ -661,7 +661,7 @@ msgstr "المجموع" #: db_structure.php:455 libraries/StorageEngine.class.php:351 #, php-format msgid "%s is the default storage engine on this MySQL server." -msgstr "" +msgstr "%s هو محرك التخزين الإفتراضي لخادم MySQL" #: db_structure.php:483 db_structure.php:500 db_structure.php:501 #: libraries/display_tbl.lib.php:2184 libraries/display_tbl.lib.php:2189 @@ -736,7 +736,7 @@ msgstr "قاموس البيانات" #: db_tracking.php:79 msgid "Tracked tables" -msgstr "" +msgstr "الجداول المتعقبة" #: db_tracking.php:84 libraries/config/messages.inc.php:482 #: libraries/export/htmlword.php:89 libraries/export/latex.php:162 @@ -753,7 +753,7 @@ msgstr "قاعدة البيانات" #: db_tracking.php:86 msgid "Last version" -msgstr "" +msgstr "آخر إصدار" #: db_tracking.php:87 tbl_tracking.php:588 msgid "Created" @@ -778,7 +778,7 @@ msgstr "العملية" #: db_tracking.php:101 js/messages.php:34 msgid "Delete tracking data for this table" -msgstr "" +msgstr "حذف بيانات التتبع لهذا الجدول" #: db_tracking.php:119 tbl_tracking.php:542 tbl_tracking.php:600 msgid "active" @@ -794,49 +794,49 @@ msgstr "نسخ" #: db_tracking.php:135 tbl_tracking.php:373 tbl_tracking.php:619 msgid "Tracking report" -msgstr "" +msgstr "تقرير التتبع" #: db_tracking.php:136 tbl_tracking.php:245 tbl_tracking.php:619 msgid "Structure snapshot" -msgstr "" +msgstr "لقطة للبناء الهيكلي" #: db_tracking.php:181 msgid "Untracked tables" -msgstr "" +msgstr "الجداول الغير متتبعة" #: db_tracking.php:201 db_tracking.php:203 tbl_structure.php:622 #: tbl_structure.php:624 msgid "Track table" -msgstr "" +msgstr "تتبع الجدول" #: db_tracking.php:229 msgid "Database Log" -msgstr "" +msgstr "سجل قاعدة البيانات" #: enum_editor.php:21 libraries/tbl_properties.inc.php:793 #, php-format msgid "Values for the column \"%s\"" -msgstr "" +msgstr "قيم للعمود \"%s\"" #: enum_editor.php:22 libraries/tbl_properties.inc.php:794 msgid "Enter each value in a separate field." -msgstr "" +msgstr "أدخل كل قيمة بحقل منفصل" #: enum_editor.php:57 msgid "+ Restart insertion and add a new value" -msgstr "" +msgstr "+ أعد الإدخال و أضف قيمة جديدة" #: enum_editor.php:67 msgid "Output" -msgstr "" +msgstr "المخرجات" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" -msgstr "" +msgstr "نسخ ولصق القيم المضمومة لحقل \"Length/Values\"" #: export.php:73 msgid "Selected export type has to be saved in file!" -msgstr "" +msgstr "نوع التصدير المحدد سيحفظ في الملف!" #: export.php:164 export.php:189 export.php:671 #, php-format @@ -867,6 +867,8 @@ msgid "" "You probably tried to upload too large file. Please refer to %sdocumentation" "%s for ways to workaround this limit." msgstr "" +"يبدو أنك تحاول رفع ملف كبير الحجم , فضلاً راجع المستند %sdocumentation%s لحل " +"المشكلة." #: import.php:278 import.php:331 libraries/File.class.php:501 #: libraries/File.class.php:611 @@ -880,7 +882,7 @@ msgstr "لم يمكن قراءة الملف" msgid "" "You attempted to load file with unsupported compression (%s). Either support " "for it is not implemented or disabled by your configuration." -msgstr "" +msgstr "انت تحاول رفع ملف بصيغة ضغط غير معروفة (%s)." #: import.php:336 msgid "" @@ -888,10 +890,12 @@ msgid "" "file size exceeded the maximum size permitted by your PHP configuration. See " "[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]." msgstr "" +"لايوجد أي بيانات لإستيرادها , إما انه لم يتم إرسال إسم الملف , أو أن حجم " +"الملف أكبر من الحجم المحدد في إعدادات PHP" #: import.php:371 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" -msgstr "" +msgstr "لايمكن تحميل الإضافات المستوردة ,, فضلاً تحقق من عملية التنصيب ." #: import.php:396 msgid "The bookmark has been deleted." @@ -899,7 +903,7 @@ msgstr "لقد حذفت العلامة المرجعية." #: import.php:400 msgid "Showing bookmark" -msgstr "" +msgstr "عرض العلامة المرجعية" #: import.php:402 sql.php:884 #, php-format @@ -909,19 +913,23 @@ msgstr "تم إنشاء العلامة المرجعية %s" #: import.php:408 import.php:414 #, php-format msgid "Import has been successfully finished, %d queries executed." -msgstr "" +msgstr "الإستيراد إنتهى بنجاح , %d إستعلام تم تنفيذه." #: import.php:423 msgid "" "Script timeout passed, if you want to finish import, please resubmit same " "file and import will resume." msgstr "" +"إنتهى وقت التنفيذ , إذا كنت تريد إنهاء الإستيراد, أعد إرسال نفس الملف وسوف " +"يتم إستكمال الإستيراد" #: import.php:425 msgid "" "However on last run no data has been parsed, this usually means phpMyAdmin " "won't be able to finish this import unless you increase php time limits." msgstr "" +"لم يتم تحليل البيانات في العملية الأخيرة ,, هذا يعني ان phpMyAdmin لاتستطيع " +"إنهاء الإستيراد ,, يجب زيادة المدة المحددة لتنفيذ php" #: import.php:453 libraries/Message.class.php:185 #: libraries/display_tbl.lib.php:2080 libraries/sql_query_form.lib.php:139 @@ -948,7 +956,7 @@ msgstr "اضغط للاختيار" #: js/messages.php:26 msgid "Click to unselect" -msgstr "" +msgstr "إضغط لإلغاء الإختيار" #: js/messages.php:27 libraries/import.lib.php:103 sql.php:195 msgid "\"DROP DATABASE\" statements are disabled." @@ -960,7 +968,7 @@ msgstr "هل تريد حقا " #: js/messages.php:31 libraries/mult_submits.inc.php:242 sql.php:278 msgid "You are about to DESTROY a complete database!" -msgstr "" +msgstr "أنت على وشك إزالة كامل قاعدة البيانات !" #: js/messages.php:32 msgid "Dropping Event" @@ -978,20 +986,20 @@ msgstr "يسمح بإضافة واستبدال البيانات." #: js/messages.php:36 msgid "Dropping Primary Key/Index" -msgstr "" +msgstr "حذف المفتاح الرئيسي مفتاح/فهرس" #: js/messages.php:37 msgid "This operation could take a long time. Proceed anyway?" -msgstr "" +msgstr "هذه العملية قد تأخذ وقت طويل , متابعة على أي حال ؟" #: js/messages.php:40 msgid "You are about to DISABLE a BLOB Repository!" -msgstr "" +msgstr "أنت على وشك إلغاء مستودع BLOB!" #: js/messages.php:41 #, php-format msgid "Are you sure you want to disable all BLOB references for database %s?" -msgstr "" +msgstr "هل تريد حقاً إلغاء كل مراجع BLOB في قاعدة البيانات %s ؟" #: js/messages.php:44 msgid "Missing value in the form!" @@ -1054,7 +1062,7 @@ msgstr "ألغ" #: js/messages.php:63 msgid "Loading" -msgstr "" +msgstr "تحميل" #: js/messages.php:64 #, fuzzy @@ -1064,15 +1072,15 @@ msgstr "معالَجات" #: js/messages.php:65 libraries/import/ods.php:80 msgid "Error in Processing Request" -msgstr "" +msgstr "خطأ في معالجة الطلب" #: js/messages.php:66 msgid "Dropping Column" -msgstr "" +msgstr "إزالة العمود" #: js/messages.php:67 msgid "Adding Primary Key" -msgstr "" +msgstr "إضافة مفتاح رئيسي" #: js/messages.php:68 libraries/relation.lib.php:87 pmd_general.php:386 #: pmd_general.php:543 pmd_general.php:591 pmd_general.php:667 @@ -1136,7 +1144,7 @@ msgstr "استعلام-SQL" #: js/messages.php:88 msgid "Inline Edit" -msgstr "" +msgstr "تعديل سريع" #: js/messages.php:89 libraries/Index.class.php:465 #: libraries/common.lib.php:626 libraries/common.lib.php:1164 @@ -1179,15 +1187,15 @@ msgstr "تجاهل" #: js/messages.php:101 msgid "Select referenced key" -msgstr "" +msgstr "إختيار المفتاح المرجع" #: js/messages.php:102 msgid "Select Foreign Key" -msgstr "" +msgstr "إختيار المفتاح الغريب" #: js/messages.php:103 msgid "Please select the primary key or a unique key" -msgstr "" +msgstr "فضلاً أختر المفتاح الرئيسي أو المفتاح الفريد" #: js/messages.php:104 pmd_general.php:87 tbl_relation.php:545 #, fuzzy @@ -1197,7 +1205,7 @@ msgstr "اختر الحقل لإظهاره" #: js/messages.php:107 msgid "Add an option for column " -msgstr "" +msgstr "إضافة خيار للعمود" #: js/messages.php:110 #, fuzzy @@ -1227,11 +1235,13 @@ msgid "" "A newer version of phpMyAdmin is available and you should consider " "upgrading. The newest version is %s, released on %s." msgstr "" +"يوجد إصدارأحدث من phpMyAdmin متوفر حالياً ,, ينبغى أن تعمل ترقية.أحدث إصدار " +"هو %s, released on %s." #. l10n: Latest available phpMyAdmin version #: js/messages.php:120 msgid ", latest stable version:" -msgstr "" +msgstr ", آخر إصدار مستقر:" #. l10n: Display text for calendar close link #: js/messages.php:138 @@ -1528,39 +1538,41 @@ msgstr "حجم الخط" #: libraries/File.class.php:310 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." -msgstr "" +msgstr "حجم الملف المرفوع يتجاوز حجم الملف المسموح به في إعدادات php" #: libraries/File.class.php:313 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form." -msgstr "" +msgstr "حجم الملف المرفوع يتجاوز حجم الملف المحدد به في نموذج HTML" #: libraries/File.class.php:316 msgid "The uploaded file was only partially uploaded." -msgstr "" +msgstr "تم رفع جزء من الملف فقط." #: libraries/File.class.php:319 msgid "Missing a temporary folder." -msgstr "" +msgstr "المجلد المؤقت مفقود." #: libraries/File.class.php:322 msgid "Failed to write file to disk." -msgstr "" +msgstr "فشلت عملية كتابة الملف على القرص." #: libraries/File.class.php:325 msgid "File upload stopped by extension." -msgstr "" +msgstr "رفع الملف إستوقف من قبل الامتداد." #: libraries/File.class.php:328 msgid "Unknown error in file upload." -msgstr "" +msgstr "خطأ غير معروف عند رفع الملف." #: libraries/File.class.php:559 msgid "" "Error moving the uploaded file, see [a@./Documentation." "html#faq1_11@Documentation]FAQ 1.11[/a]" msgstr "" +"خطأ عند نقل الملف المرفوع , إنظر :[a@./Documentation." +"html#faq1_11@Documentation]FAQ 1.11[/a]" #: libraries/Index.class.php:427 tbl_relation.php:526 msgid "No index defined!" @@ -1579,7 +1591,7 @@ msgstr "مميز" #: libraries/Index.class.php:444 tbl_tracking.php:317 msgid "Packed" -msgstr "" +msgstr "محزم" #: libraries/Index.class.php:446 tbl_tracking.php:319 msgid "Cardinality" @@ -1642,22 +1654,22 @@ msgstr[1] "" #: libraries/StorageEngine.class.php:194 msgid "" "There is no detailed status information available for this storage engine." -msgstr "" +msgstr "لايوجد معلومات تفصيلية لحالة محرك التخزين هذا." #: libraries/StorageEngine.class.php:354 #, php-format msgid "%s is available on this MySQL server." -msgstr "" +msgstr "%s متوفر في خادم MySQL هذا." #: libraries/StorageEngine.class.php:357 #, php-format msgid "%s has been disabled for this MySQL server." -msgstr "" +msgstr "%s معطل في خادم MySQL هذا." #: libraries/StorageEngine.class.php:361 #, php-format msgid "This MySQL server does not support the %s storage engine." -msgstr "" +msgstr "خادم MySQL هذا لايدعم محرك التخزين %s ." #: libraries/Table.class.php:1017 msgid "Invalid database" @@ -1680,30 +1692,30 @@ msgstr "تم إعادة تسمية الجدول %s إلى %s" #: libraries/Theme.class.php:160 #, php-format msgid "No valid image path for theme %s found!" -msgstr "" +msgstr "مسار الصورة للمظهر %s غير صحيح!" #: libraries/Theme.class.php:380 msgid "No preview available." -msgstr "" +msgstr "لاتتوفر معاينة." #: libraries/Theme.class.php:383 msgid "take it" -msgstr "" +msgstr "إعتبر" #: libraries/Theme_Manager.class.php:109 #, php-format msgid "Default theme %s not found!" -msgstr "" +msgstr "المظهر الإفتراضي %s غير موجود!" #: libraries/Theme_Manager.class.php:147 #, php-format msgid "Theme %s not found!" -msgstr "" +msgstr "المظهر %s غير موجود!" #: libraries/Theme_Manager.class.php:215 #, php-format msgid "Theme path not found for theme %s!" -msgstr "" +msgstr "مسار المظهر غير موجود للمظهر %s !" #: libraries/Theme_Manager.class.php:291 test/theme.php:160 themes.php:20 #: themes.php:40 @@ -1712,7 +1724,7 @@ msgstr "" #: libraries/auth/config.auth.lib.php:76 msgid "Cannot connect: invalid settings." -msgstr "" +msgstr "لايمكن الإتصال: إعدادات غير صحيحة." #: libraries/auth/config.auth.lib.php:91 #: libraries/auth/cookie.auth.lib.php:205 libraries/auth/http.auth.lib.php:64 @@ -1726,7 +1738,7 @@ msgstr "أهلا بك في %s" msgid "" "You probably did not create a configuration file. You might want to use the " "%1$ssetup script%2$s to create one." -msgstr "" +msgstr "يبدو انك لم تنشئ ملف الإعدادات.إستخدم %1$ssetup script%2$s لإنشائه." #: libraries/auth/config.auth.lib.php:115 msgid "" @@ -1753,7 +1765,7 @@ msgstr "مستندات وثائقية لـ phpMyAdmin (بالإنجليزية)" #: libraries/auth/cookie.auth.lib.php:244 #: libraries/auth/cookie.auth.lib.php:245 msgid "You can enter hostname/IP address and port separated by space." -msgstr "" +msgstr "يمكن أن تدخل عنوان المضيف والمنفذ مفصولان بالمسافة." #: libraries/auth/cookie.auth.lib.php:244 msgid "Server:" @@ -1780,12 +1792,13 @@ msgstr "يجب تفعيل دعم الكوكيز في هذه المرحلة." msgid "" "Login without a password is forbidden by configuration (see AllowNoPassword)" msgstr "" +"تم منع الدخول بدون كلمة مرور ممنوع في الإعدادات , إنظر قيمة (AllowNoPassword)" #: libraries/auth/cookie.auth.lib.php:648 #: libraries/auth/signon.auth.lib.php:226 #, php-format msgid "No activity within %s seconds; please log in again" -msgstr "" +msgstr "لانشاط منذ %s ثواني , الرجاء تسجيل الدخول من جديد" #: libraries/auth/cookie.auth.lib.php:658 #: libraries/auth/cookie.auth.lib.php:660 @@ -1800,12 +1813,12 @@ msgstr "خطأ اسم المستخدم/كلمة السر. الدخول ممنو #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format msgid "File %s does not contain any key id" -msgstr "" +msgstr "الملف %s لايحتوي على أي مفتاح تعريف" #: libraries/auth/swekey/swekey.auth.lib.php:157 #: libraries/auth/swekey/swekey.auth.lib.php:180 msgid "Hardware authentication failed" -msgstr "" +msgstr "فشلت المصادقة المحسوسة" #: libraries/auth/swekey/swekey.auth.lib.php:166 msgid "No valid authentication key plugged" @@ -1813,23 +1826,23 @@ msgstr "" #: libraries/auth/swekey/swekey.auth.lib.php:202 msgid "Authenticating..." -msgstr "" +msgstr "مصادقة..." #: libraries/blobstreaming.lib.php:241 msgid "PBMS error" -msgstr "" +msgstr "خطأ PBMS" #: libraries/blobstreaming.lib.php:267 msgid "PBMS connection failed:" -msgstr "" +msgstr "فشل إتصال PBMS:" #: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" -msgstr "" +msgstr "فشل جلب معلومات PBMS BLOB:" #: libraries/blobstreaming.lib.php:320 msgid "get BLOB Content-Type failed" -msgstr "" +msgstr "فشل جلب نوع محتوى BLOB:" #: libraries/blobstreaming.lib.php:347 msgid "View image" @@ -1850,11 +1863,11 @@ msgstr "نزل الملف" #: libraries/blobstreaming.lib.php:421 #, php-format msgid "Could not open file: %s" -msgstr "" +msgstr "لايمكن فتح الملف : %s" #: libraries/bookmark.lib.php:83 msgid "shared" -msgstr "" +msgstr "مشترك" #: libraries/build_html_for_db.lib.php:25 #: libraries/config/messages.inc.php:181 libraries/export/xml.php:36 @@ -1894,11 +1907,11 @@ msgstr "لايوجد قواعد بيانات" #: libraries/build_html_for_db.lib.php:130 msgid "Not replicated" -msgstr "" +msgstr "غير مستنسخة" #: libraries/build_html_for_db.lib.php:136 msgid "Replicated" -msgstr "" +msgstr "مستنسخة" #: libraries/build_html_for_db.lib.php:150 #, php-format @@ -1955,7 +1968,7 @@ msgstr "" #: libraries/common.inc.php:585 #, php-format msgid "Could not load default configuration from: %1$s" -msgstr "" +msgstr "لا يمكن تحميل الإعدادات الإفتراضية من : %1$s" #: libraries/common.inc.php:590 msgid "" @@ -1973,7 +1986,7 @@ msgstr "فهرس خادم غير صحيح: %s" #: libraries/common.inc.php:627 #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." -msgstr "" +msgstr "إسم المضيف غير صحيح للخادم %1$s." #: libraries/common.inc.php:636 libraries/config/messages.inc.php:486 #: libraries/header.inc.php:115 main.php:161 server_synchronize.php:1174 @@ -1983,7 +1996,7 @@ msgstr "خادم" #: libraries/common.inc.php:819 msgid "Invalid authentication method set in configuration:" -msgstr "" +msgstr "اسلوب مصادقة غير صحيح في الإعدادات:" #: libraries/common.inc.php:922 #, php-format @@ -1993,7 +2006,7 @@ msgstr "عليك التحديث إلى %s %s أو لاحقا." #: libraries/common.lib.php:142 #, php-format msgid "Max: %s%s" -msgstr "" +msgstr "كبير: %s%s" #. l10n: Language to use for MySQL 5.5 documentation, please use only languages which do exist in official documentation. #: libraries/common.lib.php:404 @@ -2035,7 +2048,7 @@ msgstr "MySQL قال: " #: libraries/common.lib.php:1098 msgid "Failed to connect to SQL validator!" -msgstr "" +msgstr "فشل الإتصال بمدقق SQL!" #: libraries/common.lib.php:1139 libraries/config/messages.inc.php:463 msgid "Explain SQL" @@ -2068,15 +2081,15 @@ msgstr "التحقق من استعلام SQL" #: libraries/common.lib.php:1265 msgid "Inline edit of this query" -msgstr "" +msgstr "تعديل سريع لهذا الإستعلام" #: libraries/common.lib.php:1267 msgid "Inline" -msgstr "" +msgstr "مضمن" #: libraries/common.lib.php:1334 libraries/common.lib.php:1350 msgid "Profiling" -msgstr "" +msgstr "جانبي" #: libraries/common.lib.php:1355 libraries/tbl_triggers.lib.php:27 #: server_processlist.php:70 @@ -2194,7 +2207,7 @@ msgstr "عمليات" #: libraries/common.lib.php:2966 msgid "Browse your computer:" -msgstr "" +msgstr "تصفح كمبيوترك." #: libraries/common.lib.php:2979 #, fuzzy, php-format @@ -2209,15 +2222,15 @@ msgstr "الدليل الذي حددته لتحميل عملك لا يمكن ا #: libraries/common.lib.php:2999 msgid "There are no files to upload" -msgstr "" +msgstr "لايوجد أي ملفات لرفعها" #: libraries/config.values.php:45 libraries/config.values.php:50 msgid "Both" -msgstr "" +msgstr "كلا" #: libraries/config.values.php:74 msgid "Open" -msgstr "" +msgstr "فتح" #: libraries/config.values.php:74 #, fuzzy @@ -2230,13 +2243,13 @@ msgstr "أغلق" #: libraries/export/sql.php:79 libraries/export/texytext.php:23 #: libraries/import.lib.php:1172 msgid "structure" -msgstr "" +msgstr "بناء" #: libraries/config.values.php:96 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 msgid "data" -msgstr "" +msgstr "بيانات" #: libraries/config.values.php:97 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 @@ -2248,15 +2261,15 @@ msgstr "البنية والبيانات" #: libraries/config.values.php:99 msgid "Quick - display only the minimal options to configure" -msgstr "" +msgstr "سريع - عرض خيارات أقل" #: libraries/config.values.php:100 msgid "Custom - display all possible options to configure" -msgstr "" +msgstr "مخصص - عرض كل الخيارات المحتملة" #: libraries/config.values.php:101 msgid "Custom - like above, but without the quick/custom choice" -msgstr "" +msgstr "مخصص - مثل مافي الأعلى , لكن بدون الخيار سريع/مخصص" #: libraries/config.values.php:119 #, fuzzy @@ -2272,43 +2285,43 @@ msgstr "إدخال مدد" #: libraries/config.values.php:121 msgid "both of the above" -msgstr "" +msgstr "كلاهما" #: libraries/config.values.php:122 msgid "neither of the above" -msgstr "" +msgstr "لاشيء منهم" #: libraries/config/FormDisplay.class.php:83 #: libraries/config/validate.lib.php:422 msgid "Not a positive number" -msgstr "" +msgstr "ليس عدد موجب" #: libraries/config/FormDisplay.class.php:84 #: libraries/config/validate.lib.php:435 msgid "Not a non-negative number" -msgstr "" +msgstr "ليس عدد غير سالب" #: libraries/config/FormDisplay.class.php:85 #: libraries/config/validate.lib.php:409 msgid "Not a valid port number" -msgstr "" +msgstr "رقم منفذ غير صحيح" #: libraries/config/FormDisplay.class.php:86 #: libraries/config/FormDisplay.class.php:574 #: libraries/config/validate.lib.php:360 libraries/config/validate.lib.php:450 msgid "Incorrect value" -msgstr "" +msgstr "قيمة غير صحيحة" #: libraries/config/FormDisplay.class.php:87 #: libraries/config/validate.lib.php:464 #, php-format msgid "Value must be equal or lower than %s" -msgstr "" +msgstr "القيمة يجب أن تساوي أو أقل من %s" #: libraries/config/FormDisplay.class.php:538 #, php-format msgid "Missing data for %s" -msgstr "" +msgstr "بيانات مفقودة لـ %s" #: libraries/config/FormDisplay.class.php:736 #: libraries/config/FormDisplay.class.php:740 @@ -2321,21 +2334,21 @@ msgstr "متغير" #: libraries/config/FormDisplay.class.php:741 #, php-format msgid "\"%s\" requires %s extension" -msgstr "" +msgstr "%s يتطلب الإمتداد %s" #: libraries/config/FormDisplay.class.php:755 #, php-format msgid "import will not work, missing function (%s)" -msgstr "" +msgstr "الإستيراد لن يتم , الدالة (%s) مفقودة" #: libraries/config/FormDisplay.class.php:759 #, php-format msgid "export will not work, missing function (%s)" -msgstr "" +msgstr "التصدير لن يتم , الدالة (%s) مفقودة" #: libraries/config/FormDisplay.class.php:766 msgid "SQL Validator is disabled" -msgstr "" +msgstr "مدقق SQL معطل" #: libraries/config/FormDisplay.class.php:773 #, fuzzy @@ -2346,11 +2359,11 @@ msgstr "لم يمكن إيجاد الوصلة" #: libraries/config/FormDisplay.class.php:781 #, php-format msgid "maximum %s" -msgstr "" +msgstr "أقصى %s" #: libraries/config/FormDisplay.tpl.php:173 msgid "This setting is disabled, it will not be applied to your configuration" -msgstr "" +msgstr "هذا الإعداد معطل , لن يتم تطبيقه في التكوين" #: libraries/config/FormDisplay.tpl.php:173 libraries/relation.lib.php:89 #: libraries/relation.lib.php:96 pmd_relation_new.php:68 @@ -2360,16 +2373,16 @@ msgstr "معطل" #: libraries/config/FormDisplay.tpl.php:248 #, php-format msgid "Set value: %s" -msgstr "" +msgstr "تعيين القيمة: %s" #: libraries/config/FormDisplay.tpl.php:253 #: libraries/config/messages.inc.php:351 msgid "Restore default value" -msgstr "" +msgstr "إستعادة القيمة الإفتراضية" #: libraries/config/FormDisplay.tpl.php:269 msgid "Allow users to customize this value" -msgstr "" +msgstr "السماح للمستخدمين بتخصيص هذه القيمة" #: libraries/config/FormDisplay.tpl.php:333 #: libraries/schema/User_Schema.class.php:470 prefs_manage.php:320 @@ -2379,7 +2392,7 @@ msgstr "إلغاء" #: libraries/config/messages.inc.php:17 msgid "Improves efficiency of screen refresh" -msgstr "" +msgstr "تحسين كفاءة تحديث الشاشة" #: libraries/config/messages.inc.php:18 #, fuzzy @@ -2394,7 +2407,7 @@ msgstr "" #: libraries/config/messages.inc.php:20 msgid "Allow login to any MySQL server" -msgstr "" +msgstr "السماح بالدخول لأي خادم MySQL" #: libraries/config/messages.inc.php:21 msgid "" @@ -2402,6 +2415,8 @@ msgid "" "inside a frame, and is a potential [strong]security hole[/strong] allowing " "cross-frame scripting attacks" msgstr "" +"تفعيل هذا يسمح للصفحات الموجودة في أماكن مختلفة بإستدعاء phpMyAdmin داخل " +"إطار, وهذا من المحتمل ان يسبب ثغرة أمنية." #: libraries/config/messages.inc.php:22 msgid "Allow third party framing" @@ -2409,13 +2424,13 @@ msgstr "" #: libraries/config/messages.inc.php:23 msgid "Show "Drop database" link to normal users" -msgstr "" +msgstr "عرض رابط "إزالة قاعدة البيانات&quot للمستخدمين العاديين" #: libraries/config/messages.inc.php:24 msgid "" "Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] " "authentication" -msgstr "" +msgstr "عبارة المرور السرية تستخدم لتشفير الكوكيز في المصادقة" #: libraries/config/messages.inc.php:25 msgid "Blowfish secret" @@ -2423,7 +2438,7 @@ msgstr "" #: libraries/config/messages.inc.php:26 msgid "Highlight selected rows" -msgstr "" +msgstr "توضيح الصفوف المختارة" #: libraries/config/messages.inc.php:27 msgid "Row marker" @@ -2431,21 +2446,23 @@ msgstr "" #: libraries/config/messages.inc.php:28 msgid "Highlight row pointed by the mouse cursor" -msgstr "" +msgstr "توضيح الصفوف المشار إليها بمؤشر الفأرة" #: libraries/config/messages.inc.php:29 msgid "Highlight pointer" -msgstr "" +msgstr "توضيح المؤشر" #: libraries/config/messages.inc.php:30 msgid "" "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " "import and export operations" msgstr "" +"تفعيل ضغط [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] لعمليات التصدير " +"والإستيراد" #: libraries/config/messages.inc.php:31 msgid "Bzip2" -msgstr "" +msgstr "Bzip2" #: libraries/config/messages.inc.php:32 msgid "" @@ -2453,30 +2470,32 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" +"يعرف أي أدوات التعديل تستخدم مع الأعمدة CHAR و VARCHAR ,,[kbd]input[/kbd] - " +"تسمح بمدخل محدود الطول ,, [kbd]textarea[/kbd] - تسمح بتعدد الأسطر في العمود. " #: libraries/config/messages.inc.php:33 msgid "CHAR columns editing" -msgstr "" +msgstr "تعديل أعمدة CHAR" #: libraries/config/messages.inc.php:34 msgid "Number of columns for CHAR/VARCHAR textareas" -msgstr "" +msgstr "عدد أعمدة مربع النص لـCHAR/VARCHAR" #: libraries/config/messages.inc.php:35 msgid "CHAR textarea columns" -msgstr "" +msgstr "أعمدة مربع النص لـ CHAR" #: libraries/config/messages.inc.php:36 msgid "Number of rows for CHAR/VARCHAR textareas" -msgstr "" +msgstr "عدد صفوف مربع النص لـCHAR/VARCHAR" #: libraries/config/messages.inc.php:37 msgid "CHAR textarea rows" -msgstr "" +msgstr "صفوف مربع النص لـ CHAR" #: libraries/config/messages.inc.php:38 msgid "Check config file permissions" -msgstr "" +msgstr "تحقق من أذونات ملف التكوين" #: libraries/config/messages.inc.php:39 msgid "" @@ -2486,26 +2505,27 @@ msgstr "" #: libraries/config/messages.inc.php:40 msgid "Compress on the fly" -msgstr "" +msgstr "ضغط" #: libraries/config/messages.inc.php:41 setup/frames/config.inc.php:25 #: setup/frames/index.inc.php:153 msgid "Configuration file" -msgstr "" +msgstr "ملف التكوين" #: libraries/config/messages.inc.php:42 msgid "" "Whether a warning ("Are your really sure...") should be displayed " "when you're about to lose data" msgstr "" +"التحذير (" هل أنت متأكد " ) يظهر عندما تكون على وشك فقدان بيانات" #: libraries/config/messages.inc.php:43 msgid "Confirm DROP queries" -msgstr "" +msgstr "تأكيد إستعلامات DROP" #: libraries/config/messages.inc.php:44 msgid "Debug SQL" -msgstr "" +msgstr "تصحيح SQL" #: libraries/config/messages.inc.php:45 #, fuzzy @@ -2518,62 +2538,64 @@ msgid "" "[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates " "maximum number for which vertical model is used" msgstr "" +"[kbd]أفقي[/kbd] , [kbd]رأسي[/kbd] أو عدد يشير إلى أكبر عدد من الأعمدة " +"يستعمله النموذج" #: libraries/config/messages.inc.php:47 msgid "Display direction for altering/creating columns" -msgstr "" +msgstr "عرض الإتجاه لـ تعديل/إنشاء الأعمدة" #: libraries/config/messages.inc.php:48 msgid "Tab that is displayed when entering a database" -msgstr "" +msgstr "التبويب الذي يعرض عند الدخول إلى قاعدة البيانات" #: libraries/config/messages.inc.php:49 msgid "Default database tab" -msgstr "" +msgstr "تبويب قاعدة البيانات الإفتراضي" #: libraries/config/messages.inc.php:50 msgid "Tab that is displayed when entering a server" -msgstr "" +msgstr "التبويب الذي يعرض عند الدخول إلى الخادم" #: libraries/config/messages.inc.php:51 msgid "Default server tab" -msgstr "" +msgstr "تبويب الخادم الإفتراضي" #: libraries/config/messages.inc.php:52 msgid "Tab that is displayed when entering a table" -msgstr "" +msgstr "التبويب الذي يعرض عند الدخول إلى الجدول" #: libraries/config/messages.inc.php:53 msgid "Default table tab" -msgstr "" +msgstr "تبويب الجدول الإفتراضي" #: libraries/config/messages.inc.php:54 msgid "Show binary contents as HEX by default" -msgstr "" +msgstr "عرض البيانات الثنائية بالنظام الست عشري إفتراضياً" #: libraries/config/messages.inc.php:55 libraries/display_tbl.lib.php:590 msgid "Show binary contents as HEX" -msgstr "" +msgstr "عرض البيانات الثنائية بالنظام الست عشري" #: libraries/config/messages.inc.php:56 msgid "Show database listing as a list instead of a drop down" -msgstr "" +msgstr "إظهار قواعد البيانات كقائمة بدلاً من القائمة المنسدلة" #: libraries/config/messages.inc.php:57 msgid "Display databases as a list" -msgstr "" +msgstr "إظهار قواعد البيانات كقائمة" #: libraries/config/messages.inc.php:58 msgid "Show server listing as a list instead of a drop down" -msgstr "" +msgstr "إظهار الخوادم كقائمة بدلاً من القائمة المنسدلة" #: libraries/config/messages.inc.php:59 msgid "Display servers as a list" -msgstr "" +msgstr "إظهار الخوادم كقائمة" #: libraries/config/messages.inc.php:60 msgid "Edit SQL queries in popup window" -msgstr "" +msgstr "تعديل إستعلام SQL في نافذة منبثقة" #: libraries/config/messages.inc.php:61 #, fuzzy @@ -2595,7 +2617,7 @@ msgstr "أخطاء." #: libraries/config/messages.inc.php:64 msgid "Show icons for warning, error and information messages" -msgstr "" +msgstr "عرض الأيقونات لرسائل التحذير, الخطأ والمعلومات" #: libraries/config/messages.inc.php:65 #, fuzzy @@ -2607,11 +2629,11 @@ msgstr "أخطاء." msgid "" "Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no " "limit)" -msgstr "" +msgstr "ضع الوقت المحدد لعمل البرنامج ([kbd]0[/kbd]: لانهائي)" #: libraries/config/messages.inc.php:67 msgid "Maximum execution time" -msgstr "" +msgstr "وقت التنفيذ الأقصى" #: libraries/config/messages.inc.php:68 prefs_manage.php:299 msgid "Save as file" @@ -2619,7 +2641,7 @@ msgstr "حفظ كملف" #: libraries/config/messages.inc.php:69 libraries/config/messages.inc.php:237 msgid "Character set of the file" -msgstr "" +msgstr "مجموعة الأحرف للملف" #: libraries/config/messages.inc.php:70 libraries/config/messages.inc.php:86 #: tbl_printview.php:373 tbl_structure.php:831 @@ -2670,7 +2692,7 @@ msgstr "استبدل NULL بـ" #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:82 msgid "Remove CRLF characters within columns" -msgstr "" +msgstr "حذف CRLF من الأعمدة" #: libraries/config/messages.inc.php:77 libraries/config/messages.inc.php:243 #: libraries/config/messages.inc.php:251 libraries/import/csv.php:62 @@ -2693,15 +2715,15 @@ msgstr "إصدارة إكسل" #: libraries/config/messages.inc.php:83 msgid "Database name template" -msgstr "" +msgstr "إسم قالب قاعدة البيانات" #: libraries/config/messages.inc.php:84 msgid "Server name template" -msgstr "" +msgstr "إسم قالب الخادم" #: libraries/config/messages.inc.php:85 msgid "Table name template" -msgstr "" +msgstr "إسم قالب الجدول" #: libraries/config/messages.inc.php:89 libraries/config/messages.inc.php:102 #: libraries/config/messages.inc.php:111 libraries/config/messages.inc.php:135 @@ -2750,7 +2772,7 @@ msgstr "نوع التصدير" #: libraries/config/messages.inc.php:112 libraries/config/messages.inc.php:114 msgid "Save on server" -msgstr "" +msgstr "حفظ في الخادم" #: libraries/config/messages.inc.php:113 libraries/config/messages.inc.php:115 #: libraries/display_export.lib.php:195 libraries/display_export.lib.php:221 @@ -2759,7 +2781,7 @@ msgstr "خزن على الملفات الموجودة أصلا" #: libraries/config/messages.inc.php:116 msgid "Remember file name template" -msgstr "" +msgstr "تذكر إسم قالب الملف" #: libraries/config/messages.inc.php:118 #, fuzzy @@ -2770,11 +2792,11 @@ msgstr "حماية أسماء الجداول و الحقول ب \"`\" " #: libraries/config/messages.inc.php:119 libraries/config/messages.inc.php:258 #: libraries/display_export.lib.php:353 msgid "SQL compatibility mode" -msgstr "" +msgstr "وضع توافق SQL" #: libraries/config/messages.inc.php:120 libraries/config/messages.inc.php:130 msgid "Syntax to use when inserting data" -msgstr "" +msgstr "بناء الجملة لإستخدامه عند إدخال البيانات" #: libraries/config/messages.inc.php:121 msgid "Creation/Update/Check dates" @@ -2786,11 +2808,11 @@ msgstr "استخدم الإضافات المتأخرة" #: libraries/config/messages.inc.php:123 libraries/export/sql.php:53 msgid "Disable foreign key checks" -msgstr "" +msgstr "تعطيل التحقق من المفتاح الغريب" #: libraries/config/messages.inc.php:126 msgid "Use hexadecimal for BLOB" -msgstr "" +msgstr "إستخدم النظام الست عشري لـ BLOB" #: libraries/config/messages.inc.php:128 #, fuzzy @@ -2800,7 +2822,7 @@ msgstr "استخدم الإضافات المتأخرة" #: libraries/config/messages.inc.php:131 libraries/export/sql.php:163 msgid "Maximal length of created query" -msgstr "" +msgstr "أقصى طول للإستعلام المنشئ" #: libraries/config/messages.inc.php:136 #, fuzzy @@ -2810,19 +2832,19 @@ msgstr "تصدير" #: libraries/config/messages.inc.php:137 libraries/export/sql.php:50 msgid "Enclose export in a transaction" -msgstr "" +msgstr "تضمين التصدير في العملية" #: libraries/config/messages.inc.php:138 msgid "Export time in UTC" -msgstr "" +msgstr "وقت التصدير (بالتوقيت العالمي)" #: libraries/config/messages.inc.php:146 msgid "Force secured connection while using phpMyAdmin" -msgstr "" +msgstr "فرض الإتصال الآمن عند إستخدام phpMyAdmin" #: libraries/config/messages.inc.php:147 msgid "Force SSL connection" -msgstr "" +msgstr "فرض إتصال SSL" #: libraries/config/messages.inc.php:148 msgid "" @@ -2832,30 +2854,30 @@ msgstr "" #: libraries/config/messages.inc.php:149 msgid "Foreign key dropdown order" -msgstr "" +msgstr "قائمة منسدلة مرتبة بالمفتاح الغريب" #: libraries/config/messages.inc.php:150 msgid "A dropdown will be used if fewer items are present" -msgstr "" +msgstr "سيتم إستخدام القائمة المنسدلة إذا وجد عدد أقل من العناصر" #: libraries/config/messages.inc.php:151 msgid "Foreign key limit" -msgstr "" +msgstr "حد المفتاح الغريب" #: libraries/config/messages.inc.php:152 msgid "Browse mode" -msgstr "" +msgstr "وضع الإستعراض" #: libraries/config/messages.inc.php:153 msgid "Customize browse mode" -msgstr "" +msgstr "تخصيص وضع الإستعراض" #: libraries/config/messages.inc.php:155 libraries/config/messages.inc.php:157 #: libraries/config/messages.inc.php:174 libraries/config/messages.inc.php:185 #: libraries/config/messages.inc.php:187 libraries/config/messages.inc.php:215 #: libraries/config/messages.inc.php:227 msgid "Customize default options" -msgstr "" +msgstr "تخصيص الخيارات الإفتراضية" #: libraries/config/messages.inc.php:156 libraries/config/setup.forms.php:232 #: libraries/config/setup.forms.php:311 @@ -2867,32 +2889,32 @@ msgstr "سي إس في" #: libraries/config/messages.inc.php:158 msgid "Developer" -msgstr "" +msgstr "مطور" #: libraries/config/messages.inc.php:159 msgid "Settings for phpMyAdmin developers" -msgstr "" +msgstr "إعدادات لمطوري phpMyAdmin" #: libraries/config/messages.inc.php:160 msgid "Edit mode" -msgstr "" +msgstr "وضع التعديل" #: libraries/config/messages.inc.php:161 msgid "Customize edit mode" -msgstr "" +msgstr "تخصيص وضع التعديل" #: libraries/config/messages.inc.php:163 msgid "Export defaults" -msgstr "" +msgstr "إفتراضيات التصدير" #: libraries/config/messages.inc.php:164 msgid "Customize default export options" -msgstr "" +msgstr "تخصيص خيارات التصدير الإفتراضي" #: libraries/config/messages.inc.php:165 libraries/config/messages.inc.php:207 #: setup/frames/menu.inc.php:16 msgid "Features" -msgstr "" +msgstr "مميزات" #: libraries/config/messages.inc.php:166 #, fuzzy @@ -2902,7 +2924,7 @@ msgstr "ولد" #: libraries/config/messages.inc.php:167 msgid "Set some commonly used options" -msgstr "" +msgstr "تعيين بعض الخيارات شائعة الإستخدام" #: libraries/config/messages.inc.php:168 libraries/db_links.inc.php:83 #: libraries/server_links.inc.php:73 libraries/tbl_links.inc.php:82 @@ -2912,19 +2934,19 @@ msgstr "استورد" #: libraries/config/messages.inc.php:169 msgid "Import defaults" -msgstr "" +msgstr "إفتراضيات الإستيراد" #: libraries/config/messages.inc.php:170 msgid "Customize default common import options" -msgstr "" +msgstr "تخصيص خيارات الإستيراد الإفتراضية" #: libraries/config/messages.inc.php:171 msgid "Import / export" -msgstr "" +msgstr "إستيراد / تصدير" #: libraries/config/messages.inc.php:172 msgid "Set import and export directories and compression options" -msgstr "" +msgstr "حدد عناوين الإستيراد والتصدير و خيارات الضغط" #: libraries/config/messages.inc.php:173 libraries/export/latex.php:26 msgid "LaTeX" @@ -2932,15 +2954,15 @@ msgstr "لاتكس" #: libraries/config/messages.inc.php:176 msgid "Databases display options" -msgstr "" +msgstr "خيارات عرض قواعد البيانات" #: libraries/config/messages.inc.php:177 setup/frames/menu.inc.php:18 msgid "Navigation frame" -msgstr "" +msgstr "إطار التصفح" #: libraries/config/messages.inc.php:178 msgid "Customize appearance of the navigation frame" -msgstr "" +msgstr "تخصيص مظهر إطار التصفح" #: libraries/config/messages.inc.php:179 libraries/select_server.lib.php:42 #: setup/frames/index.inc.php:98 @@ -2949,19 +2971,19 @@ msgstr "خوادم" #: libraries/config/messages.inc.php:180 msgid "Servers display options" -msgstr "" +msgstr "خيارات عرض الخوادم" #: libraries/config/messages.inc.php:182 msgid "Tables display options" -msgstr "" +msgstr "خيارات عرض الجداول" #: libraries/config/messages.inc.php:183 setup/frames/menu.inc.php:19 msgid "Main frame" -msgstr "" +msgstr "الإطار الرئيسي" #: libraries/config/messages.inc.php:184 msgid "Microsoft Office" -msgstr "" +msgstr "مايكروسوفت أوفيس" #: libraries/config/messages.inc.php:186 #, fuzzy @@ -2971,11 +2993,11 @@ msgstr "مستندات وثائقية" #: libraries/config/messages.inc.php:188 msgid "Other core settings" -msgstr "" +msgstr "الإعدادات الرئيسية الأخرى" #: libraries/config/messages.inc.php:189 msgid "Settings that didn't fit enywhere else" -msgstr "" +msgstr "الإعدادات التي لاتناسب في أي مكان آخر" #: libraries/config/messages.inc.php:190 #, fuzzy @@ -2999,21 +3021,22 @@ msgstr "نافذة الاستعلام" #: libraries/config/messages.inc.php:193 msgid "Customize query window options" -msgstr "" +msgstr "تخصيص خيارات نافذة الإستعلام" #: libraries/config/messages.inc.php:194 msgid "Security" -msgstr "" +msgstr "الأمان" #: libraries/config/messages.inc.php:195 msgid "" "Please note that phpMyAdmin is just a user interface and its features do not " "limit MySQL" msgstr "" +"فضلاً , تذكر أن phpMyAdmin هي واجة إستخدام فقط ولا يمكن أن تتجاوز حدود MySQL" #: libraries/config/messages.inc.php:196 msgid "Basic settings" -msgstr "" +msgstr "الإعدادات الأساسية" #: libraries/config/messages.inc.php:197 #, fuzzy @@ -3023,25 +3046,25 @@ msgstr "مستندات وثائقية" #: libraries/config/messages.inc.php:198 msgid "Authentication settings" -msgstr "" +msgstr "خيارات المصادقة" #: libraries/config/messages.inc.php:199 msgid "Server configuration" -msgstr "" +msgstr "إعداد الخادم" #: libraries/config/messages.inc.php:200 msgid "" "Advanced server configuration, do not change these options unless you know " "what they are for" -msgstr "" +msgstr "إعداد متقدم للخادم , لاتغير أي من هذه القيم حتى تعلم وظيفتها" #: libraries/config/messages.inc.php:201 msgid "Enter server connection parameters" -msgstr "" +msgstr "أدخل معلومات إتصال الخادم" #: libraries/config/messages.inc.php:202 msgid "Configuration storage" -msgstr "" +msgstr "إعداد التخزين" #: libraries/config/messages.inc.php:203 msgid "" @@ -5530,7 +5553,7 @@ msgstr "أوامر" #: libraries/export/sql.php:111 msgid "<code>CREATE TABLE</code> options:" -msgstr "" +msgstr "خيارات <code>CREATE TABLE</code> :" #: libraries/export/sql.php:123 msgid "" @@ -9539,7 +9562,7 @@ msgstr "" #: tbl_row_action.php:28 msgid "No rows selected" -msgstr "" +msgstr "لايوجد صفوف مختارة" #: tbl_select.php:109 msgid "Do a \"query by example\" (wildcard: \"%\")" diff --git a/po/az.po b/po/az.po index 1b859aa..e819b1b 100644 --- a/po/az.po +++ b/po/az.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" diff --git a/po/be.po b/po/be.po index 85bbd5c..7859752 100644 --- a/po/be.po +++ b/po/be.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" diff --git a/po/be(a)latin.po b/po/be(a)latin.po index 2af239e..2316236 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-30 23:09+0200\n" diff --git a/po/bg.po b/po/bg.po index b707b2f..c3c1638 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-22 12:51+0200\n" @@ -4520,7 +4520,7 @@ msgstr "" msgid "" "Please be patient, the file is being uploaded. Details about the upload are " "not available." -msgstr "" +msgstr "Файлът се качва, бъдете търпеливи. Не са налични повече подробности." #: libraries/display_import.lib.php:129 msgid "Importing into the current server" diff --git a/po/bn.po b/po/bn.po index 2edd88f..a4a53e6 100644 --- a/po/bn.po +++ b/po/bn.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-10-21 01:36+0200\n" diff --git a/po/bs.po b/po/bs.po index d17e6cf..4080369 100644 --- a/po/bs.po +++ b/po/bs.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" diff --git a/po/ca.po b/po/ca.po index 436c069..434d4f1 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-23 09:57+0200\n" diff --git a/po/cs.po b/po/cs.po index 5d8533f..69a060c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" diff --git a/po/cy.po b/po/cy.po index 0156048..373bca7 100644 --- a/po/cy.po +++ b/po/cy.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-06-07 20:23+0200\n" diff --git a/po/da.po b/po/da.po index c6d1e77..5e0d4e7 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-07 01:17+0200\n" @@ -9539,8 +9539,10 @@ msgid "Width" msgstr "" #: tbl_chart.php:94 +#, fuzzy +#| msgid "Right" msgid "Height" -msgstr "" +msgstr "Højre" #: tbl_chart.php:98 msgid "Title" diff --git a/po/de.po b/po/de.po index f5dde39..ec9af7b 100644 --- a/po/de.po +++ b/po/de.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-23 04:28+0200\n" diff --git a/po/el.po b/po/el.po index 68b4bb7..69cea61 100644 --- a/po/el.po +++ b/po/el.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-05 11:15+0200\n" diff --git a/po/en_GB.po b/po/en_GB.po index e307458..b37926d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 16:24+0200\n" diff --git a/po/es.po b/po/es.po index 4e62406..076f3f1 100644 --- a/po/es.po +++ b/po/es.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-02 11:10+0200\n" diff --git a/po/et.po b/po/et.po index 465202a..107be8e 100644 --- a/po/et.po +++ b/po/et.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" diff --git a/po/eu.po b/po/eu.po index cfe7b0f..18723d1 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:53+0200\n" diff --git a/po/fa.po b/po/fa.po index 61aa0c4..d632aca 100644 --- a/po/fa.po +++ b/po/fa.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-05-19 03:54+0200\n" diff --git a/po/fi.po b/po/fi.po index ec38819..fb6cf9e 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-11-26 21:29+0200\n" @@ -9850,8 +9850,10 @@ msgid "Width" msgstr "" #: tbl_chart.php:94 +#, fuzzy +#| msgid "Right" msgid "Height" -msgstr "" +msgstr "Oikea" #: tbl_chart.php:98 msgid "Title" diff --git a/po/fr.po b/po/fr.po index 5bd6d74..071390b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 19:23+0200\n" diff --git a/po/gl.po b/po/gl.po index 6d28e6a..fc30353 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:50+0200\n" diff --git a/po/he.po b/po/he.po index b797b7f..074f895 100644 --- a/po/he.po +++ b/po/he.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-02 20:17+0200\n" diff --git a/po/hi.po b/po/hi.po index 23c92de..06341d6 100644 --- a/po/hi.po +++ b/po/hi.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-24 00:23+0200\n" diff --git a/po/hr.po b/po/hr.po index e936fbb..d6b2ef2 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:54+0200\n" diff --git a/po/hu.po b/po/hu.po index 0fc74e3..8ab0e64 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-05 12:49+0200\n" diff --git a/po/id.po b/po/id.po index 6e4c65d..0634f94 100644 --- a/po/id.po +++ b/po/id.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-16 22:04+0200\n" @@ -9294,8 +9294,10 @@ msgid "Width" msgstr "" #: tbl_chart.php:94 +#, fuzzy +#| msgid "Right" msgid "Height" -msgstr "" +msgstr "Kanan" #: tbl_chart.php:98 msgid "Title" diff --git a/po/it.po b/po/it.po index 758b2bc..71f5d3c 100644 --- a/po/it.po +++ b/po/it.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-05 14:27+0200\n" diff --git a/po/ja.po b/po/ja.po index d72fb91..35e1d41 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-05 11:38+0200\n" diff --git a/po/ka.po b/po/ka.po index bbcc672..d079bff 100644 --- a/po/ka.po +++ b/po/ka.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" diff --git a/po/ko.po b/po/ko.po index ea99b4e..d04ac09 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-06-16 18:18+0200\n" diff --git a/po/lt.po b/po/lt.po index c28c645..e3d12e9 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-05 15:52+0200\n" diff --git a/po/lv.po b/po/lv.po index 02dcaa7..edfab85 100644 --- a/po/lv.po +++ b/po/lv.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" diff --git a/po/mk.po b/po/mk.po index b9466de..4deb4b4 100644 --- a/po/mk.po +++ b/po/mk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" diff --git a/po/ml.po b/po/ml.po index 22c9f22..167850c 100644 --- a/po/ml.po +++ b/po/ml.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the phpMyAdmin package. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" diff --git a/po/mn.po b/po/mn.po index afede01..06cc511 100644 --- a/po/mn.po +++ b/po/mn.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" diff --git a/po/ms.po b/po/ms.po index 68525a2..1734f4b 100644 --- a/po/ms.po +++ b/po/ms.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" diff --git a/po/nb.po b/po/nb.po index 5070755..1a7b7f9 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-07 11:21+0200\n" diff --git a/po/nl.po b/po/nl.po index 4ea7430..3f962a3 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-16 20:18+0200\n" diff --git a/po/pl.po b/po/pl.po index 4615bf2..9dd43c8 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1po/pl.podd43c8 100644o18+0200\n"sourceforge.net\n"n package.а налични повече подробности." "ields'] + 1, 'values' => join(',', $values))); ?>">es=<?php echo urlencode(join(",", $values)); ?>">��*��}�*6 ��!�!0&��&��x��*��"�}�*�}�*0&��}�*o&��*��}�*p��*�t��*�y��*�T�*x��*��}�*�!�!0&��&��Mz�*��"�}�*�}�*0&��}�*o&��`&��X&��*�p��&��}�*�T�*��`��}�*GHIJKMNOP0&��&��HQ�*0��"�}�*�}�*0&��0��*��}�*��*�9.�*p��*�t��*�y��*�T�*HQ�*0��p��}�*8Q�*0��}�*(Q�*0��}�*Q�*0��}�* �~��*��}�*�y��*��.�*��}�*�t��*��y�.�*��}�*p��*��Z�.�*��}�*�4.�*��*�9.�*p��*ؔ��*�t��*�y��*�T�*�},�*P �� }�*#%')*-.035678:<=0&��&��p��*p!��"�}�*8��*��}�*ؔ��*��*�T�*cf��*�&��p��*p!��@ ��}�*�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv��*�'��F�a�*F�a�*?��*�'��"��*��}�*��* )��B�a�*�'��o&��|��*�&��B�a�*�&��},7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-24 16:21+0200\n" diff --git a/po/pt.po b/po/pt.po index 134bba0..25967b3 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-26 03:23+0200\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 498e3ff..bcf1e55 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-14 17:44+0200\n" diff --git a/po/ro.po b/po/ro.po index 27c4097..2abf608 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:28+0200\n" diff --git a/po/ru.po b/po/ru.po index 7695759..4cc2484 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-13 21:17+0200\n" diff --git a/po/si.po b/po/si.po index 8d40cd6..f20fbf1 100644 --- a/po/si.po +++ b/po/si.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-04 14:56+0200\n" diff --git a/po/sk.po b/po/sk.po index ff50f36..a82c16c 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:26+0200\n" diff --git a/po/sl.po b/po/sl.po index 447615d..644813e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-24 22:38+0200\n" diff --git a/po/sq.po b/po/sq.po index aa253fe..ef4f592 100644 --- a/po/sq.po +++ b/po/sq.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:51+0200\n" diff --git a/po/sr.po b/po/sr.po index d7f0d97..947f45e 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-06 18:43+0200\n" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index 281fc99..2cc42cf 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-12-02 14:49+0200\n" diff --git a/po/sv.po b/po/sv.po index 81ef445..983612b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-16 21:42+0200\n" diff --git a/po/ta.po b/po/ta.po index 626c028..d05bd8d 100644 --- a/po/ta.po +++ b/po/ta.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-04-16 10:43+0200\n" diff --git a/po/te.po b/po/te.po index 16aaf5f..27b3b43 100644 --- a/po/te.po +++ b/po/te.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-07 17:06+0200\n" diff --git a/po/th.po b/po/th.po index 714a120..1078972 100644 --- a/po/th.po +++ b/po/th.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" diff --git a/po/tr.po b/po/tr.po index 3fa9cb8..a754a7b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-17 19:11+0200\n" diff --git a/po/tt.po b/po/tt.po index ee440f6..3f883ee 100644 --- a/po/tt.po +++ b/po/tt.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:25+0200\n" diff --git a/po/ug.po b/po/ug.po index 414a53b..8aae807 100644 --- a/po/ug.po +++ b/po/ug.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-08-26 11:59+0200\n" diff --git a/po/uk.po b/po/uk.po index b4e9a8d..46256ef 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-12-28 22:26+0200\n" diff --git a/po/ur.po b/po/ur.po index 7cfaddf..54913e6 100644 --- a/po/ur.po +++ b/po/ur.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-23 08:37+0200\n" diff --git a/po/uz.po b/po/uz.po index 3345148..7381e7f 100644 --- a/po/uz.po +++ b/po/uz.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:31+0200\n" diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index 6b49e0d..0135f35 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:30+0200\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 594e455..979a8f5 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-04 09:47+0200\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 1141e10..eaf18e4 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-31 09:47+0800\n" diff --git a/scripts/remove-incomplete-mo b/scripts/remove-incomplete-mo index d9e485c..ec7d3b3 100755 --- a/scripts/remove-incomplete-mo +++ b/scripts/remove-incomplete-mo @@ -8,7 +8,7 @@ set -e # # How many percent needs to be translated # -THRESHOLD=50 +THRESHOLD=40 # # Generated output file diff --git a/tbl_structure.php b/tbl_structure.php index ffdb0d2..7d380b4 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -252,7 +252,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { // for the case ENUM('–','“') $type = htmlspecialchars($type); if(strlen($type) > $GLOBALS['cfg']['LimitChars']) { - $type = '<abbr title="full text">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; + $type = '<abbr title="' . $type . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; } $type_nowrap = ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, STABLE, updated. RELEASE_3_4_3-21-gda05272
by Marc Delisle 27 Jun '11

27 Jun '11

The branch, STABLE has been updated via da052729c9c1783836ed0de402939c54fc2a94f8 (commit) via 9fc6e35cfd1d8270d943f5577807a3c79f5c6168 (commit) via d3b67a35a0df4969273529501788c68b4fddcc24 (commit) via e21d6073e46d41afbf0a09ba9bd38cd19f37e968 (commit) via 79d924add8c5e2070f7ab0301e1c98ac42fee806 (commit) via 4bec3b3bee31a1bd88a176f8c1cd5033c970fece (commit) via 2c6666bf03c4a866d625955092fb1b4613e18f72 (commit) via 52269e0e56260280b82109e41573179d93676a5b (commit) via dc6c1e8b5cc0d2d116e000cba7752f60be248ffd (commit) via cb043f4365be9b8edec63188d339eda2154401fc (commit) via a8caf74fdafdce6b65a411635593f2347ae984ae (commit) via 6944ee44cecc53d104b341a31094b6bfba13f3af (commit) via 3bd3f60b288ff841028ce8258006e33edeee562a (commit) via 6616a6b34c51d11013dc4956507af85de055f50d (commit) via ada8916b98d5a74e3bb4124e3d9dd417af69e007 (commit) via b45de543c00b4eb39d9f67cb6d1c93f73f444863 (commit) via bbe388010b4ce9821fa9bd4d8be02ea92847f5ca (commit) via 9d2269d297cdc04dfe19d29025afb28b87a83f66 (commit) via 99bae4acb9a94c93ca31c8d49eb9a771f34aad54 (commit) via 396e4e99799c91a8c39f2bbe156e6795cdef6ee5 (commit) via 8cebaca19b08f8faa5eaebfdb2d87c466f274db8 (commit) via c4c8fcb2b5fbf88fbe6dbcc987fd104d060eac4d (commit) via fa6640559b53c595888b8632ccf3c1abd970fa04 (commit) via 7ff4cb07cccd093ceea296f964f6c8b00a5e7654 (commit) via 7602e1593c1565b4dbd90df13fd162cee6546798 (commit) via e49ab1bfe13119633c6bf94eb7439ecb0d28841d (commit) via bbccc368173294f8d713a0f4dbfca28560811b33 (commit) via 20118f89cf9a84f019d77c748e8eb7d390781669 (commit) via c422694746d75d0fdb54fa7b11afa2156e4de8dc (commit) via 2d56821c0f1337ae3fec7e845a396e2b0448fdeb (commit) via 82ac1e8028b5ec7d5b95e5cf2a2e47c452dfa5c5 (commit) via 7afbe60f2b612b0ee0d222bad8c4867c7acbebac (commit) via 42fd105f2431649eadfaa249edcf7fd1964b4c8e (commit) via 54cf26644a465a9a4d0c184d8f9282f54ba3021c (commit) via 2a22d7dae71e2560e667431541a4c7bbf854905c (commit) via 7996a365756f08c2175d996e1fa9efd3829c4b96 (commit) via 86d3b7e58c7e87b3ee1fb9cc0fcb08dd2e73d24e (commit) via 60089624dd6fdf1e31a05c551e4c78c21d06fb9d (commit) via 2bdfe069826caf9d4f5c82cfbb2a71b6990b976d (commit) via 612f8f3d67aea31debdc7df83bc6628997e6aade (commit) via ab1a2394c3df043d81080792028ed739338674f5 (commit) via 15ef12542eaf64f63d25846c522477c695c7647f (commit) via 3f214f9e7d0177f15d97fb6cf8f6ddeeef69e901 (commit) via 8feecf664750ef4e55efff5c49734f81c21d4bd0 (commit) from 38feafa2e09f80e614cae6726bc1cbb663e2c79f (commit) - Log ----------------------------------------------------------------- commit da052729c9c1783836ed0de402939c54fc2a94f8 Merge: 38feafa2e09f80e614cae6726bc1cbb663e2c79f 9fc6e35cfd1d8270d943f5577807a3c79f5c6168 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 27 10:25:47 2011 -0400 Merge branch 'MAINT_3_4_3' into STABLE ----------------------------------------------------------------------- Summary of changes: ChangeLog | 17 ++- Documentation.html | 4 +- README | 2 +- db_search.php | 2 +- enum_editor.php | 8 +- import.php | 2 +- js/functions.js | 11 +- js/sql.js | 25 ++- libraries/Config.class.php | 2 +- libraries/config/messages.inc.php | 2 +- libraries/display_tbl.lib.php | 15 ++- libraries/sqlparser.data.php | 3 +- po/af.po | 2 +- po/ar.po | 423 +++++++++++++++++++----------------- po/az.po | 6 +- po/be.po | 2 +- po/be(a)latin.po | 2 +- po/bg.po | 60 +++-- po/bn.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 357 +++++++++++++++++-------------- po/de.po | 2 +- po/el.po | 2 +- po/en_GB.po | 2 +- po/es.po | 2 +- po/et.po | 2 +- po/eu.po | 2 +- po/fa.po | 2 +- po/fi.po | 22 +- po/fr.po | 2 +- po/gl.po | 2 +- po/he.po | 2 +- po/hi.po | 2 +- po/hr.po | 2 +- po/hu.po | 6 +- po/id.po | 25 ++- po/it.po | 2 +- po/ja.po | 2 +- po/ka.po | 2 +- po/ko.po | 2 +- po/lt.po | 2 +- po/lv.po | 2 +- po/mk.po | 10 +- po/ml.po | 2 +- po/mn.po | 2 +- po/ms.po | 12 +- po/nb.po | 2 +- po/nl.po | 2 +- po/pl.po | 2 +- po/pt.po | 12 +- po/pt_BR.po | 58 +++--- po/ro.po | 2 +- po/ru.po | 2 +- po/si.po | 2 +- po/sk.po | 2 +- po/sl.po | 2 +- po/sq.po | 2 +- po/sr.po | 2 +- po/sr(a)latin.po | 2 +- po/sv.po | 2 +- po/ta.po | 6 +- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/tt.po | 2 +- po/ug.po | 2 +- po/uk.po | 8 +- po/ur.po | 2 +- po/uz.po | 2 +- po/uz(a)latin.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- scripts/remove-incomplete-mo | 2 +- server_privileges.php | 2 +- server_replication.php | 3 +- server_synchronize.php | 18 +- tbl_structure.php | 2 +- 80 files changed, 684 insertions(+), 541 deletions(-) diff --git a/ChangeLog b/ChangeLog index 945c547..cb3ba9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,21 @@ -phpMyAdmin - ChangeLog +phpMyAdmin - ChangeLog ====================== +3.4.3.0 (2011-06-27) +- bug #3311170 [sync] Missing helper icons in Synchronize +- patch #3304473 [setup] Redefine a lable that was wrong +- bug #3304544 [parser] master is not a reserved word +- bug #3307616 [edit] Inline edit updates multiple duplicate rows +- patch #3311539 [edit] Inline edit does not escape backslashes +- bug #3313210 [interface] Columns class sometimes changed for nothing +- patch #3313326 [interface] Some tooltips do not disappear +- bug #3315720 [search] Fix search in non unicode tables +- bug #3315741 [display] Inline query edit broken +- patch #3317206 [privileges] Generate password option missing on new accounts +- bug #3317293 [edit] Inline edit places HTML line breaks in edit area +- bug #3319466 [interface] Inline query edit does not escape special characters +- minor XSS (require a valid token) + 3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label - bug #3303869 [interface] Unnecessary scrolling on Databases page diff --git a/Documentation.html b/Documentation.html index 3531ef6..576c1f0 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.2 - Documentation</title> + <title>phpMyAdmin 3.4.3 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.2 + 3.4.3 Documentation </h1> </div> diff --git a/README b/README index a652994..02ad016 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.2 +Version 3.4.3 A set of PHP-scripts to manage MySQL over the web. diff --git a/db_search.php b/db_search.php index fba68d1..d93fd74 100644 --- a/db_search.php +++ b/db_search.php @@ -178,7 +178,7 @@ if (isset($_REQUEST['submit_search'])) { $thefieldlikevalue = array(); foreach ($tblfields as $tblfield) { if (! isset($field) || strlen($field) == 0 || $tblfield == $field) { - $thefieldlikevalue[] = PMA_backquote($tblfield) + $thefieldlikevalue[] = 'CONVERT(' . PMA_backquote($tblfield) . ' USING utf8)' . ' ' . $like_or_regex . ' ' . "'" . $automatic_wildcard . $search_word diff --git a/enum_editor.php b/enum_editor.php index 088275f..ab86d73 100644 --- a/enum_editor.php +++ b/enum_editor.php @@ -53,12 +53,12 @@ require_once './libraries/header_meta_style.inc.php'; ?> </div> <p> - <a href="enum_editor.php?token=<?php echo urlencode($_GET['token']); ?>&field=<?php echo urlencode($_GET['field']); ?>&extra_fields=<?php echo $_GET['extra_fields'] + 1; ?>&values=<?php echo urlencode(join(",", $values)); ?>"> + <a href="enum_editor.php<?php echo PMA_generate_common_url(array('field' => $_GET['field'], 'extra_fields' => $_GET['extra_fields'] + 1, 'values' => join(',', $values))); ?>"> <?php echo __('+ Restart insertion and add a new value'); ?> </a> </p> - <input type="hidden" name="token" value="<?php echo $_GET['token']; ?>" /> - <input type="hidden" name="field" value="<?php echo $_GET['field']; ?>" /> + <?php echo PMA_generate_common_hidden_inputs(); ?> + <input type="hidden" name="field" value="<?php echo htmlspecialchars($_GET['field']); ?>" /> <input type="hidden" name="num_fields" value="<?php echo $total_fields; ?>" /> <input type="submit" value="<?php echo __('Go'); ?>" /> </form> @@ -66,7 +66,7 @@ require_once './libraries/header_meta_style.inc.php'; <div id="enum_editor_output"> <h3><?php echo __('Output'); ?></h3> <p><?php echo __('Copy and paste the joined values into the "Length/Values" field'); ?></p> - <textarea id="joined_values" cols="95" rows="5"><?php echo join(",", $values); ?></textarea> + <textarea id="joined_values" cols="95" rows="5"><?php echo htmlspecialchars(join(",", $values)); ?></textarea> </div> </div> </body> diff --git a/import.php b/import.php index 78e5ffd..d706b60 100644 --- a/import.php +++ b/import.php @@ -108,7 +108,7 @@ if ($import_type == 'table') { } $err_url = $goto . '?' . $common - . (preg_match('@^tbl_[a-z]*\.php$@', $goto) ? '&table=' . urlencode($table) : ''); + . (preg_match('@^tbl_[a-z]*\.php$@', $goto) ? '&table=' . htmlspecialchars($table) : ''); $_SESSION['Import_message']['go_back_url'] = $err_url; } diff --git a/js/functions.js b/js/functions.js index 8c5bc64..eea8573 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1116,7 +1116,7 @@ function changeMIMEType(db, table, reference, mime_type) * Jquery Coding for inline editing SQL_QUERY */ $(document).ready(function(){ - $(".inline_edit_sql").click( function(){ + $(".inline_edit_sql").live('click', function(){ var db = $(this).prev().find("input[name='db']").val(); var table = $(this).prev().find("input[name='table']").val(); var token = $(this).prev().find("input[name='token']").val(); @@ -1131,7 +1131,12 @@ $(document).ready(function(){ $(".btnSave").each(function(){ $(this).click(function(){ sql_query = $(this).prev().val(); - window.location.replace("import.php?db=" + db +"&table=" + table + "&sql_query=" + sql_query + "&show_query=1&token=" + token); + window.location.replace("import.php" + + "?db=" + encodeURIComponent(db) + + "&table=" + encodeURIComponent(table) + + "&sql_query=" + encodeURIComponent(sql_query) + + "&show_query=1" + + "&token=" + token); }); }); $(".btnDiscard").each(function(){ @@ -1988,7 +1993,7 @@ $(document).ready(function() { $(this).qtip({ content: tooltip_text, show: { delay: 0 }, - hide: { when: 'unfocus', delay: 0 }, + hide: { delay: 1000 }, style: { background: '#ffffcc' } }); }); diff --git a/js/sql.js b/js/sql.js index 32a5bba..e871c74 100644 --- a/js/sql.js +++ b/js/sql.js @@ -678,8 +678,10 @@ $(document).ready(function() { // and store the current value in a hidden span if($this_field.is(':not(.truncated, .transformed, .relation, .enum, .set, .null)')) { // handle non-truncated, non-transformed, non-relation values + + value = data_value.replace("<br>", "\n"); // We don't need to get any more data, just wrap the value - $this_field.append('<textarea>'+data_value+'</textarea>'); + $this_field.append('<textarea>' + value + '</textarea>'); $this_field.data('original_data', data_value); } else if($this_field.is('.truncated, .transformed')) { @@ -888,16 +890,20 @@ $(document).ready(function() { */ var is_null = $this_field.find('input:checkbox').is(':checked'); var value; + var addQuotes = true; if (is_null) { sql_query += ' `' + field_name + "`=NULL , "; need_to_post = true; } else { - if($this_field.is(":not(.relation, .enum, .set)")) { + if($this_field.is(":not(.relation, .enum, .set, .bit)")) { this_field_params[field_name] = $this_field.find('textarea').val(); if($this_field.is('.transformed')) { $.extend(transform_fields, this_field_params); } + } else if ($this_field.is('.bit')) { + this_field_params[field_name] = '0b' + $this_field.find('textarea').val(); + addQuotes = false; } else if ($this_field.is('.set')) { $test_element = $this_field.find('select'); this_field_params[field_name] = $test_element.map(function(){ @@ -924,7 +930,11 @@ $(document).ready(function() { new_clause += '`' + window.parent.table + '`.' + '`' + field_name + "` = '" + this_field_params[field_name].replace(/'/g,"''") + "'" + ' AND '; } if (this_field_params[field_name] != $this_field.data('original_data')) { - sql_query += ' `' + field_name + "`='" + this_field_params[field_name].replace(/'/g, "''") + "' , "; + if (addQuotes == true) { + sql_query += ' `' + field_name + "`='" + this_field_params[field_name].replace(/'/g, "''") + "', "; + } else { + sql_query += ' `' + field_name + "`=" + this_field_params[field_name].replace(/'/g, "''") + ", "; + } need_to_post = true; } } @@ -936,9 +946,14 @@ $(document).ready(function() { //Remove the last ',' appended in the above loop sql_query = sql_query.replace(/,\s$/, ''); + //Fix non-escaped backslashes + sql_query = sql_query.replace(/\\/g, '\\\\'); new_clause = new_clause.substring(0, new_clause.length-5); new_clause = PMA_urlencode(new_clause); sql_query += ' WHERE ' + PMA_urldecode(where_clause); + // Avoid updating more than one row in case there is no primary key + // (happened only for duplicate rows) + sql_query += ' LIMIT 1'; /** * @var rel_fields_list String, url encoded representation of {@link relations_fields} */ @@ -1132,14 +1147,14 @@ $(document).ready(function() { /** * vertical column highlighting in horizontal mode when hovering over the column header */ - $('.column_heading').live('hover', function() { + $('.column_heading.pointer').live('hover', function() { PMA_changeClassForColumn($(this), 'hover'); }); /** * vertical column marking in horizontal mode when clicking the column header */ - $('.column_heading').live('click', function() { + $('.column_heading.marker').live('click', function() { PMA_changeClassForColumn($(this), 'marked'); }); }) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 67c8ed1..cd1a0bf 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.2'); + $this->set('PMA_VERSION', '3.4.3'); /** * @deprecated */ diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 8ea3cef..266bac7 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -117,7 +117,7 @@ $strConfigExport_remember_file_template_name = __('Remember file name template') $strConfigExport_sql_auto_increment_name = __('Add AUTO_INCREMENT value'); $strConfigExport_sql_backquotes_name = __('Enclose table and column names with backquotes'); $strConfigExport_sql_compatibility_name = __('SQL compatibility mode'); -$strConfigExport_sql_create_table_statements_name = __('Syntax to use when inserting data'); +$strConfigExport_sql_create_table_statements_name = __('<code>CREATE TABLE</code> options:'); $strConfigExport_sql_dates_name = __('Creation/Update/Check dates'); $strConfigExport_sql_delayed_name = __('Use delayed inserts'); $strConfigExport_sql_disable_fk_name = __('Disable foreign key checks'); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index fc1fcf2..64a0383 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -445,7 +445,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ global $sql_query, $num_rows; global $vertical_display, $highlight_columns; - // required to generate sort links that will remember whether the + // required to generate sort links that will remember whether the // "Show all" button has been clicked $sql_md5 = md5($GLOBALS['sql_query']); $session_max_rows = $_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows']; @@ -867,6 +867,12 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ $th_class[] = 'condition'; } $th_class[] = 'column_heading'; + if ($GLOBALS['cfg']['BrowsePointerEnable'] == true) { + $th_class[] = 'pointer'; + } + if ($GLOBALS['cfg']['BrowseMarkerEnable'] == true) { + $th_class[] = 'marker'; + } echo ' class="' . implode(' ', $th_class) . '"'; if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') { @@ -1026,6 +1032,11 @@ function PMA_addClass($class, $condition_field, $meta, $nowrap, $is_field_trunca $set_class = ' set'; } + $bit_class = ''; + if(strpos($meta->type, 'bit') !== false) { + $bit_class = ' bit'; + } + $mime_type_class = ''; if(isset($meta->mimetype)) { $mime_type_class = ' ' . preg_replace('/\//', '_', $meta->mimetype); @@ -1034,7 +1045,7 @@ function PMA_addClass($class, $condition_field, $meta, $nowrap, $is_field_trunca $result = $class . ($condition_field ? ' condition' : '') . $nowrap . ' ' . ($is_field_truncated ? ' truncated' : '') . ($transform_function != $default_function ? ' transformed' : '') - . $enum_class . $set_class . $mime_type_class; + . $enum_class . $set_class . $bit_class . $mime_type_class; return $result; } diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index e8a3115..c7dacc6 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -527,7 +527,6 @@ $PMA_SQPdata_reserved_word = array ( 'LOGS', 'LOW_PRIORITY', 'MARIA', // 5.1 ? - 'MASTER', 'MASTER_CONNECT_RETRY', 'MASTER_HOST', 'MASTER_LOG_FILE', @@ -685,7 +684,7 @@ $PMA_SQPdata_reserved_word = array ( * * @global integer MySQL reserved words count */ -$PMA_SQPdata_reserved_word_cnt = 288; +$PMA_SQPdata_reserved_word_cnt = 287; /** * words forbidden to be used as column or table name wihtout quotes diff --git a/po/af.po b/po/af.po index e28bb58..bf28a23 100644 --- a/po/af.po +++ b/po/af.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-30 23:04+0200\n" diff --git a/po/ar.po b/po/ar.po index e9bd465..c468cd2 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-21 13:56+0200\n" @@ -329,7 +329,7 @@ msgstr "أضف قيودا" #: db_operations.php:528 msgid "Switch to copied database" -msgstr "" +msgstr "التبديل إلى قاعدة البيانات المنسوخة" #: db_operations.php:552 libraries/Index.class.php:447 #: libraries/build_html_for_db.lib.php:19 libraries/db_structure.lib.php:53 @@ -421,11 +421,11 @@ msgstr "عليك اختيار عمود واحد على الأقل للعرض" #: db_qbe.php:186 msgid "Switch to" -msgstr "" +msgstr "تحويل إلى" #: db_qbe.php:186 msgid "visual builder" -msgstr "" +msgstr "الباني المرئي" #: db_qbe.php:222 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:858 @@ -621,7 +621,7 @@ msgstr "جدول %s أفرغت محتوياتها" #: db_structure.php:286 tbl_operations.php:701 #, php-format msgid "View %s has been dropped" -msgstr "" +msgstr "تم إزالة %s من العرض" #: db_structure.php:286 tbl_operations.php:701 #, php-format @@ -630,29 +630,29 @@ msgstr "جدول %s حذفت" #: db_structure.php:293 tbl_create.php:295 msgid "Tracking is active." -msgstr "" +msgstr "التتبع نشط." #: db_structure.php:295 tbl_create.php:297 msgid "Tracking is not active." -msgstr "" +msgstr "التتبع غير نشط." #: db_structure.php:379 libraries/display_tbl.lib.php:2043 #, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation" "%s." -msgstr "" +msgstr "هذا العرض له ما لا يقل عدد هذه الصفوف يرجى الرجوع إلى %s الوثيقة %s" #: db_structure.php:393 db_structure.php:407 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:206 test/theme.php:73 msgid "View" -msgstr "" +msgstr "عرض" #: db_structure.php:444 libraries/db_structure.lib.php:40 #: libraries/server_links.inc.php:90 server_replication.php:31 #: server_replication.php:162 server_status.php:383 msgid "Replication" -msgstr "" +msgstr "إستنساخ" #: db_structure.php:448 msgid "Sum" @@ -661,7 +661,7 @@ msgstr "المجموع" #: db_structure.php:455 libraries/StorageEngine.class.php:351 #, php-format msgid "%s is the default storage engine on this MySQL server." -msgstr "" +msgstr "%s هو محرك التخزين الإفتراضي لخادم MySQL" #: db_structure.php:483 db_structure.php:500 db_structure.php:501 #: libraries/display_tbl.lib.php:2184 libraries/display_tbl.lib.php:2189 @@ -736,7 +736,7 @@ msgstr "قاموس البيانات" #: db_tracking.php:79 msgid "Tracked tables" -msgstr "" +msgstr "الجداول المتعقبة" #: db_tracking.php:84 libraries/config/messages.inc.php:482 #: libraries/export/htmlword.php:89 libraries/export/latex.php:162 @@ -753,7 +753,7 @@ msgstr "قاعدة البيانات" #: db_tracking.php:86 msgid "Last version" -msgstr "" +msgstr "آخر إصدار" #: db_tracking.php:87 tbl_tracking.php:588 msgid "Created" @@ -778,7 +778,7 @@ msgstr "العملية" #: db_tracking.php:101 js/messages.php:34 msgid "Delete tracking data for this table" -msgstr "" +msgstr "حذف بيانات التتبع لهذا الجدول" #: db_tracking.php:119 tbl_tracking.php:542 tbl_tracking.php:600 msgid "active" @@ -794,49 +794,49 @@ msgstr "نسخ" #: db_tracking.php:135 tbl_tracking.php:373 tbl_tracking.php:619 msgid "Tracking report" -msgstr "" +msgstr "تقرير التتبع" #: db_tracking.php:136 tbl_tracking.php:245 tbl_tracking.php:619 msgid "Structure snapshot" -msgstr "" +msgstr "لقطة للبناء الهيكلي" #: db_tracking.php:181 msgid "Untracked tables" -msgstr "" +msgstr "الجداول الغير متتبعة" #: db_tracking.php:201 db_tracking.php:203 tbl_structure.php:622 #: tbl_structure.php:624 msgid "Track table" -msgstr "" +msgstr "تتبع الجدول" #: db_tracking.php:229 msgid "Database Log" -msgstr "" +msgstr "سجل قاعدة البيانات" #: enum_editor.php:21 libraries/tbl_properties.inc.php:793 #, php-format msgid "Values for the column \"%s\"" -msgstr "" +msgstr "قيم للعمود \"%s\"" #: enum_editor.php:22 libraries/tbl_properties.inc.php:794 msgid "Enter each value in a separate field." -msgstr "" +msgstr "أدخل كل قيمة بحقل منفصل" #: enum_editor.php:57 msgid "+ Restart insertion and add a new value" -msgstr "" +msgstr "+ أعد الإدخال و أضف قيمة جديدة" #: enum_editor.php:67 msgid "Output" -msgstr "" +msgstr "المخرجات" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" -msgstr "" +msgstr "نسخ ولصق القيم المضمومة لحقل \"Length/Values\"" #: export.php:73 msgid "Selected export type has to be saved in file!" -msgstr "" +msgstr "نوع التصدير المحدد سيحفظ في الملف!" #: export.php:164 export.php:189 export.php:671 #, php-format @@ -867,6 +867,8 @@ msgid "" "You probably tried to upload too large file. Please refer to %sdocumentation" "%s for ways to workaround this limit." msgstr "" +"يبدو أنك تحاول رفع ملف كبير الحجم , فضلاً راجع المستند %sdocumentation%s لحل " +"المشكلة." #: import.php:278 import.php:331 libraries/File.class.php:501 #: libraries/File.class.php:611 @@ -880,7 +882,7 @@ msgstr "لم يمكن قراءة الملف" msgid "" "You attempted to load file with unsupported compression (%s). Either support " "for it is not implemented or disabled by your configuration." -msgstr "" +msgstr "انت تحاول رفع ملف بصيغة ضغط غير معروفة (%s)." #: import.php:336 msgid "" @@ -888,10 +890,12 @@ msgid "" "file size exceeded the maximum size permitted by your PHP configuration. See " "[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]." msgstr "" +"لايوجد أي بيانات لإستيرادها , إما انه لم يتم إرسال إسم الملف , أو أن حجم " +"الملف أكبر من الحجم المحدد في إعدادات PHP" #: import.php:371 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" -msgstr "" +msgstr "لايمكن تحميل الإضافات المستوردة ,, فضلاً تحقق من عملية التنصيب ." #: import.php:396 msgid "The bookmark has been deleted." @@ -899,7 +903,7 @@ msgstr "لقد حذفت العلامة المرجعية." #: import.php:400 msgid "Showing bookmark" -msgstr "" +msgstr "عرض العلامة المرجعية" #: import.php:402 sql.php:884 #, php-format @@ -909,19 +913,23 @@ msgstr "تم إنشاء العلامة المرجعية %s" #: import.php:408 import.php:414 #, php-format msgid "Import has been successfully finished, %d queries executed." -msgstr "" +msgstr "الإستيراد إنتهى بنجاح , %d إستعلام تم تنفيذه." #: import.php:423 msgid "" "Script timeout passed, if you want to finish import, please resubmit same " "file and import will resume." msgstr "" +"إنتهى وقت التنفيذ , إذا كنت تريد إنهاء الإستيراد, أعد إرسال نفس الملف وسوف " +"يتم إستكمال الإستيراد" #: import.php:425 msgid "" "However on last run no data has been parsed, this usually means phpMyAdmin " "won't be able to finish this import unless you increase php time limits." msgstr "" +"لم يتم تحليل البيانات في العملية الأخيرة ,, هذا يعني ان phpMyAdmin لاتستطيع " +"إنهاء الإستيراد ,, يجب زيادة المدة المحددة لتنفيذ php" #: import.php:453 libraries/Message.class.php:185 #: libraries/display_tbl.lib.php:2080 libraries/sql_query_form.lib.php:139 @@ -948,7 +956,7 @@ msgstr "اضغط للاختيار" #: js/messages.php:26 msgid "Click to unselect" -msgstr "" +msgstr "إضغط لإلغاء الإختيار" #: js/messages.php:27 libraries/import.lib.php:103 sql.php:195 msgid "\"DROP DATABASE\" statements are disabled." @@ -960,7 +968,7 @@ msgstr "هل تريد حقا " #: js/messages.php:31 libraries/mult_submits.inc.php:242 sql.php:278 msgid "You are about to DESTROY a complete database!" -msgstr "" +msgstr "أنت على وشك إزالة كامل قاعدة البيانات !" #: js/messages.php:32 msgid "Dropping Event" @@ -978,20 +986,20 @@ msgstr "يسمح بإضافة واستبدال البيانات." #: js/messages.php:36 msgid "Dropping Primary Key/Index" -msgstr "" +msgstr "حذف المفتاح الرئيسي مفتاح/فهرس" #: js/messages.php:37 msgid "This operation could take a long time. Proceed anyway?" -msgstr "" +msgstr "هذه العملية قد تأخذ وقت طويل , متابعة على أي حال ؟" #: js/messages.php:40 msgid "You are about to DISABLE a BLOB Repository!" -msgstr "" +msgstr "أنت على وشك إلغاء مستودع BLOB!" #: js/messages.php:41 #, php-format msgid "Are you sure you want to disable all BLOB references for database %s?" -msgstr "" +msgstr "هل تريد حقاً إلغاء كل مراجع BLOB في قاعدة البيانات %s ؟" #: js/messages.php:44 msgid "Missing value in the form!" @@ -1054,7 +1062,7 @@ msgstr "ألغ" #: js/messages.php:63 msgid "Loading" -msgstr "" +msgstr "تحميل" #: js/messages.php:64 #, fuzzy @@ -1064,15 +1072,15 @@ msgstr "معالَجات" #: js/messages.php:65 libraries/import/ods.php:80 msgid "Error in Processing Request" -msgstr "" +msgstr "خطأ في معالجة الطلب" #: js/messages.php:66 msgid "Dropping Column" -msgstr "" +msgstr "إزالة العمود" #: js/messages.php:67 msgid "Adding Primary Key" -msgstr "" +msgstr "إضافة مفتاح رئيسي" #: js/messages.php:68 libraries/relation.lib.php:87 pmd_general.php:386 #: pmd_general.php:543 pmd_general.php:591 pmd_general.php:667 @@ -1136,7 +1144,7 @@ msgstr "استعلام-SQL" #: js/messages.php:88 msgid "Inline Edit" -msgstr "" +msgstr "تعديل سريع" #: js/messages.php:89 libraries/Index.class.php:465 #: libraries/common.lib.php:626 libraries/common.lib.php:1164 @@ -1179,15 +1187,15 @@ msgstr "تجاهل" #: js/messages.php:101 msgid "Select referenced key" -msgstr "" +msgstr "إختيار المفتاح المرجع" #: js/messages.php:102 msgid "Select Foreign Key" -msgstr "" +msgstr "إختيار المفتاح الغريب" #: js/messages.php:103 msgid "Please select the primary key or a unique key" -msgstr "" +msgstr "فضلاً أختر المفتاح الرئيسي أو المفتاح الفريد" #: js/messages.php:104 pmd_general.php:87 tbl_relation.php:545 #, fuzzy @@ -1197,7 +1205,7 @@ msgstr "اختر الحقل لإظهاره" #: js/messages.php:107 msgid "Add an option for column " -msgstr "" +msgstr "إضافة خيار للعمود" #: js/messages.php:110 #, fuzzy @@ -1227,11 +1235,13 @@ msgid "" "A newer version of phpMyAdmin is available and you should consider " "upgrading. The newest version is %s, released on %s." msgstr "" +"يوجد إصدارأحدث من phpMyAdmin متوفر حالياً ,, ينبغى أن تعمل ترقية.أحدث إصدار " +"هو %s, released on %s." #. l10n: Latest available phpMyAdmin version #: js/messages.php:120 msgid ", latest stable version:" -msgstr "" +msgstr ", آخر إصدار مستقر:" #. l10n: Display text for calendar close link #: js/messages.php:138 @@ -1528,39 +1538,41 @@ msgstr "حجم الخط" #: libraries/File.class.php:310 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." -msgstr "" +msgstr "حجم الملف المرفوع يتجاوز حجم الملف المسموح به في إعدادات php" #: libraries/File.class.php:313 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form." -msgstr "" +msgstr "حجم الملف المرفوع يتجاوز حجم الملف المحدد به في نموذج HTML" #: libraries/File.class.php:316 msgid "The uploaded file was only partially uploaded." -msgstr "" +msgstr "تم رفع جزء من الملف فقط." #: libraries/File.class.php:319 msgid "Missing a temporary folder." -msgstr "" +msgstr "المجلد المؤقت مفقود." #: libraries/File.class.php:322 msgid "Failed to write file to disk." -msgstr "" +msgstr "فشلت عملية كتابة الملف على القرص." #: libraries/File.class.php:325 msgid "File upload stopped by extension." -msgstr "" +msgstr "رفع الملف إستوقف من قبل الامتداد." #: libraries/File.class.php:328 msgid "Unknown error in file upload." -msgstr "" +msgstr "خطأ غير معروف عند رفع الملف." #: libraries/File.class.php:559 msgid "" "Error moving the uploaded file, see [a@./Documentation." "html#faq1_11@Documentation]FAQ 1.11[/a]" msgstr "" +"خطأ عند نقل الملف المرفوع , إنظر :[a@./Documentation." +"html#faq1_11@Documentation]FAQ 1.11[/a]" #: libraries/Index.class.php:427 tbl_relation.php:526 msgid "No index defined!" @@ -1579,7 +1591,7 @@ msgstr "مميز" #: libraries/Index.class.php:444 tbl_tracking.php:317 msgid "Packed" -msgstr "" +msgstr "محزم" #: libraries/Index.class.php:446 tbl_tracking.php:319 msgid "Cardinality" @@ -1642,22 +1654,22 @@ msgstr[1] "" #: libraries/StorageEngine.class.php:194 msgid "" "There is no detailed status information available for this storage engine." -msgstr "" +msgstr "لايوجد معلومات تفصيلية لحالة محرك التخزين هذا." #: libraries/StorageEngine.class.php:354 #, php-format msgid "%s is available on this MySQL server." -msgstr "" +msgstr "%s متوفر في خادم MySQL هذا." #: libraries/StorageEngine.class.php:357 #, php-format msgid "%s has been disabled for this MySQL server." -msgstr "" +msgstr "%s معطل في خادم MySQL هذا." #: libraries/StorageEngine.class.php:361 #, php-format msgid "This MySQL server does not support the %s storage engine." -msgstr "" +msgstr "خادم MySQL هذا لايدعم محرك التخزين %s ." #: libraries/Table.class.php:1017 msgid "Invalid database" @@ -1680,30 +1692,30 @@ msgstr "تم إعادة تسمية الجدول %s إلى %s" #: libraries/Theme.class.php:160 #, php-format msgid "No valid image path for theme %s found!" -msgstr "" +msgstr "مسار الصورة للمظهر %s غير صحيح!" #: libraries/Theme.class.php:380 msgid "No preview available." -msgstr "" +msgstr "لاتتوفر معاينة." #: libraries/Theme.class.php:383 msgid "take it" -msgstr "" +msgstr "إعتبر" #: libraries/Theme_Manager.class.php:109 #, php-format msgid "Default theme %s not found!" -msgstr "" +msgstr "المظهر الإفتراضي %s غير موجود!" #: libraries/Theme_Manager.class.php:147 #, php-format msgid "Theme %s not found!" -msgstr "" +msgstr "المظهر %s غير موجود!" #: libraries/Theme_Manager.class.php:215 #, php-format msgid "Theme path not found for theme %s!" -msgstr "" +msgstr "مسار المظهر غير موجود للمظهر %s !" #: libraries/Theme_Manager.class.php:291 test/theme.php:160 themes.php:20 #: themes.php:40 @@ -1712,7 +1724,7 @@ msgstr "" #: libraries/auth/config.auth.lib.php:76 msgid "Cannot connect: invalid settings." -msgstr "" +msgstr "لايمكن الإتصال: إعدادات غير صحيحة." #: libraries/auth/config.auth.lib.php:91 #: libraries/auth/cookie.auth.lib.php:205 libraries/auth/http.auth.lib.php:64 @@ -1726,7 +1738,7 @@ msgstr "أهلا بك في %s" msgid "" "You probably did not create a configuration file. You might want to use the " "%1$ssetup script%2$s to create one." -msgstr "" +msgstr "يبدو انك لم تنشئ ملف الإعدادات.إستخدم %1$ssetup script%2$s لإنشائه." #: libraries/auth/config.auth.lib.php:115 msgid "" @@ -1753,7 +1765,7 @@ msgstr "مستندات وثائقية لـ phpMyAdmin (بالإنجليزية)" #: libraries/auth/cookie.auth.lib.php:244 #: libraries/auth/cookie.auth.lib.php:245 msgid "You can enter hostname/IP address and port separated by space." -msgstr "" +msgstr "يمكن أن تدخل عنوان المضيف والمنفذ مفصولان بالمسافة." #: libraries/auth/cookie.auth.lib.php:244 msgid "Server:" @@ -1780,12 +1792,13 @@ msgstr "يجب تفعيل دعم الكوكيز في هذه المرحلة." msgid "" "Login without a password is forbidden by configuration (see AllowNoPassword)" msgstr "" +"تم منع الدخول بدون كلمة مرور ممنوع في الإعدادات , إنظر قيمة (AllowNoPassword)" #: libraries/auth/cookie.auth.lib.php:648 #: libraries/auth/signon.auth.lib.php:226 #, php-format msgid "No activity within %s seconds; please log in again" -msgstr "" +msgstr "لانشاط منذ %s ثواني , الرجاء تسجيل الدخول من جديد" #: libraries/auth/cookie.auth.lib.php:658 #: libraries/auth/cookie.auth.lib.php:660 @@ -1800,12 +1813,12 @@ msgstr "خطأ اسم المستخدم/كلمة السر. الدخول ممنو #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format msgid "File %s does not contain any key id" -msgstr "" +msgstr "الملف %s لايحتوي على أي مفتاح تعريف" #: libraries/auth/swekey/swekey.auth.lib.php:157 #: libraries/auth/swekey/swekey.auth.lib.php:180 msgid "Hardware authentication failed" -msgstr "" +msgstr "فشلت المصادقة المحسوسة" #: libraries/auth/swekey/swekey.auth.lib.php:166 msgid "No valid authentication key plugged" @@ -1813,23 +1826,23 @@ msgstr "" #: libraries/auth/swekey/swekey.auth.lib.php:202 msgid "Authenticating..." -msgstr "" +msgstr "مصادقة..." #: libraries/blobstreaming.lib.php:241 msgid "PBMS error" -msgstr "" +msgstr "خطأ PBMS" #: libraries/blobstreaming.lib.php:267 msgid "PBMS connection failed:" -msgstr "" +msgstr "فشل إتصال PBMS:" #: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" -msgstr "" +msgstr "فشل جلب معلومات PBMS BLOB:" #: libraries/blobstreaming.lib.php:320 msgid "get BLOB Content-Type failed" -msgstr "" +msgstr "فشل جلب نوع محتوى BLOB:" #: libraries/blobstreaming.lib.php:347 msgid "View image" @@ -1850,11 +1863,11 @@ msgstr "نزل الملف" #: libraries/blobstreaming.lib.php:421 #, php-format msgid "Could not open file: %s" -msgstr "" +msgstr "لايمكن فتح الملف : %s" #: libraries/bookmark.lib.php:83 msgid "shared" -msgstr "" +msgstr "مشترك" #: libraries/build_html_for_db.lib.php:25 #: libraries/config/messages.inc.php:181 libraries/export/xml.php:36 @@ -1894,11 +1907,11 @@ msgstr "لايوجد قواعد بيانات" #: libraries/build_html_for_db.lib.php:130 msgid "Not replicated" -msgstr "" +msgstr "غير مستنسخة" #: libraries/build_html_for_db.lib.php:136 msgid "Replicated" -msgstr "" +msgstr "مستنسخة" #: libraries/build_html_for_db.lib.php:150 #, php-format @@ -1955,7 +1968,7 @@ msgstr "" #: libraries/common.inc.php:585 #, php-format msgid "Could not load default configuration from: %1$s" -msgstr "" +msgstr "لا يمكن تحميل الإعدادات الإفتراضية من : %1$s" #: libraries/common.inc.php:590 msgid "" @@ -1973,7 +1986,7 @@ msgstr "فهرس خادم غير صحيح: %s" #: libraries/common.inc.php:627 #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." -msgstr "" +msgstr "إسم المضيف غير صحيح للخادم %1$s." #: libraries/common.inc.php:636 libraries/config/messages.inc.php:486 #: libraries/header.inc.php:115 main.php:161 server_synchronize.php:1174 @@ -1983,7 +1996,7 @@ msgstr "خادم" #: libraries/common.inc.php:819 msgid "Invalid authentication method set in configuration:" -msgstr "" +msgstr "اسلوب مصادقة غير صحيح في الإعدادات:" #: libraries/common.inc.php:922 #, php-format @@ -1993,7 +2006,7 @@ msgstr "عليك التحديث إلى %s %s أو لاحقا." #: libraries/common.lib.php:142 #, php-format msgid "Max: %s%s" -msgstr "" +msgstr "كبير: %s%s" #. l10n: Language to use for MySQL 5.5 documentation, please use only languages which do exist in official documentation. #: libraries/common.lib.php:404 @@ -2035,7 +2048,7 @@ msgstr "MySQL قال: " #: libraries/common.lib.php:1098 msgid "Failed to connect to SQL validator!" -msgstr "" +msgstr "فشل الإتصال بمدقق SQL!" #: libraries/common.lib.php:1139 libraries/config/messages.inc.php:463 msgid "Explain SQL" @@ -2068,15 +2081,15 @@ msgstr "التحقق من استعلام SQL" #: libraries/common.lib.php:1265 msgid "Inline edit of this query" -msgstr "" +msgstr "تعديل سريع لهذا الإستعلام" #: libraries/common.lib.php:1267 msgid "Inline" -msgstr "" +msgstr "مضمن" #: libraries/common.lib.php:1334 libraries/common.lib.php:1350 msgid "Profiling" -msgstr "" +msgstr "جانبي" #: libraries/common.lib.php:1355 libraries/tbl_triggers.lib.php:27 #: server_processlist.php:70 @@ -2194,7 +2207,7 @@ msgstr "عمليات" #: libraries/common.lib.php:2966 msgid "Browse your computer:" -msgstr "" +msgstr "تصفح كمبيوترك." #: libraries/common.lib.php:2979 #, fuzzy, php-format @@ -2209,15 +2222,15 @@ msgstr "الدليل الذي حددته لتحميل عملك لا يمكن ا #: libraries/common.lib.php:2999 msgid "There are no files to upload" -msgstr "" +msgstr "لايوجد أي ملفات لرفعها" #: libraries/config.values.php:45 libraries/config.values.php:50 msgid "Both" -msgstr "" +msgstr "كلا" #: libraries/config.values.php:74 msgid "Open" -msgstr "" +msgstr "فتح" #: libraries/config.values.php:74 #, fuzzy @@ -2230,13 +2243,13 @@ msgstr "أغلق" #: libraries/export/sql.php:79 libraries/export/texytext.php:23 #: libraries/import.lib.php:1172 msgid "structure" -msgstr "" +msgstr "بناء" #: libraries/config.values.php:96 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 msgid "data" -msgstr "" +msgstr "بيانات" #: libraries/config.values.php:97 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 @@ -2248,15 +2261,15 @@ msgstr "البنية والبيانات" #: libraries/config.values.php:99 msgid "Quick - display only the minimal options to configure" -msgstr "" +msgstr "سريع - عرض خيارات أقل" #: libraries/config.values.php:100 msgid "Custom - display all possible options to configure" -msgstr "" +msgstr "مخصص - عرض كل الخيارات المحتملة" #: libraries/config.values.php:101 msgid "Custom - like above, but without the quick/custom choice" -msgstr "" +msgstr "مخصص - مثل مافي الأعلى , لكن بدون الخيار سريع/مخصص" #: libraries/config.values.php:119 #, fuzzy @@ -2272,43 +2285,43 @@ msgstr "إدخال مدد" #: libraries/config.values.php:121 msgid "both of the above" -msgstr "" +msgstr "كلاهما" #: libraries/config.values.php:122 msgid "neither of the above" -msgstr "" +msgstr "لاشيء منهم" #: libraries/config/FormDisplay.class.php:83 #: libraries/config/validate.lib.php:422 msgid "Not a positive number" -msgstr "" +msgstr "ليس عدد موجب" #: libraries/config/FormDisplay.class.php:84 #: libraries/config/validate.lib.php:435 msgid "Not a non-negative number" -msgstr "" +msgstr "ليس عدد غير سالب" #: libraries/config/FormDisplay.class.php:85 #: libraries/config/validate.lib.php:409 msgid "Not a valid port number" -msgstr "" +msgstr "رقم منفذ غير صحيح" #: libraries/config/FormDisplay.class.php:86 #: libraries/config/FormDisplay.class.php:574 #: libraries/config/validate.lib.php:360 libraries/config/validate.lib.php:450 msgid "Incorrect value" -msgstr "" +msgstr "قيمة غير صحيحة" #: libraries/config/FormDisplay.class.php:87 #: libraries/config/validate.lib.php:464 #, php-format msgid "Value must be equal or lower than %s" -msgstr "" +msgstr "القيمة يجب أن تساوي أو أقل من %s" #: libraries/config/FormDisplay.class.php:538 #, php-format msgid "Missing data for %s" -msgstr "" +msgstr "بيانات مفقودة لـ %s" #: libraries/config/FormDisplay.class.php:736 #: libraries/config/FormDisplay.class.php:740 @@ -2321,21 +2334,21 @@ msgstr "متغير" #: libraries/config/FormDisplay.class.php:741 #, php-format msgid "\"%s\" requires %s extension" -msgstr "" +msgstr "%s يتطلب الإمتداد %s" #: libraries/config/FormDisplay.class.php:755 #, php-format msgid "import will not work, missing function (%s)" -msgstr "" +msgstr "الإستيراد لن يتم , الدالة (%s) مفقودة" #: libraries/config/FormDisplay.class.php:759 #, php-format msgid "export will not work, missing function (%s)" -msgstr "" +msgstr "التصدير لن يتم , الدالة (%s) مفقودة" #: libraries/config/FormDisplay.class.php:766 msgid "SQL Validator is disabled" -msgstr "" +msgstr "مدقق SQL معطل" #: libraries/config/FormDisplay.class.php:773 #, fuzzy @@ -2346,11 +2359,11 @@ msgstr "لم يمكن إيجاد الوصلة" #: libraries/config/FormDisplay.class.php:781 #, php-format msgid "maximum %s" -msgstr "" +msgstr "أقصى %s" #: libraries/config/FormDisplay.tpl.php:173 msgid "This setting is disabled, it will not be applied to your configuration" -msgstr "" +msgstr "هذا الإعداد معطل , لن يتم تطبيقه في التكوين" #: libraries/config/FormDisplay.tpl.php:173 libraries/relation.lib.php:89 #: libraries/relation.lib.php:96 pmd_relation_new.php:68 @@ -2360,16 +2373,16 @@ msgstr "معطل" #: libraries/config/FormDisplay.tpl.php:248 #, php-format msgid "Set value: %s" -msgstr "" +msgstr "تعيين القيمة: %s" #: libraries/config/FormDisplay.tpl.php:253 #: libraries/config/messages.inc.php:351 msgid "Restore default value" -msgstr "" +msgstr "إستعادة القيمة الإفتراضية" #: libraries/config/FormDisplay.tpl.php:269 msgid "Allow users to customize this value" -msgstr "" +msgstr "السماح للمستخدمين بتخصيص هذه القيمة" #: libraries/config/FormDisplay.tpl.php:333 #: libraries/schema/User_Schema.class.php:470 prefs_manage.php:320 @@ -2379,7 +2392,7 @@ msgstr "إلغاء" #: libraries/config/messages.inc.php:17 msgid "Improves efficiency of screen refresh" -msgstr "" +msgstr "تحسين كفاءة تحديث الشاشة" #: libraries/config/messages.inc.php:18 #, fuzzy @@ -2394,7 +2407,7 @@ msgstr "" #: libraries/config/messages.inc.php:20 msgid "Allow login to any MySQL server" -msgstr "" +msgstr "السماح بالدخول لأي خادم MySQL" #: libraries/config/messages.inc.php:21 msgid "" @@ -2402,6 +2415,8 @@ msgid "" "inside a frame, and is a potential [strong]security hole[/strong] allowing " "cross-frame scripting attacks" msgstr "" +"تفعيل هذا يسمح للصفحات الموجودة في أماكن مختلفة بإستدعاء phpMyAdmin داخل " +"إطار, وهذا من المحتمل ان يسبب ثغرة أمنية." #: libraries/config/messages.inc.php:22 msgid "Allow third party framing" @@ -2409,13 +2424,13 @@ msgstr "" #: libraries/config/messages.inc.php:23 msgid "Show "Drop database" link to normal users" -msgstr "" +msgstr "عرض رابط "إزالة قاعدة البيانات&quot للمستخدمين العاديين" #: libraries/config/messages.inc.php:24 msgid "" "Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] " "authentication" -msgstr "" +msgstr "عبارة المرور السرية تستخدم لتشفير الكوكيز في المصادقة" #: libraries/config/messages.inc.php:25 msgid "Blowfish secret" @@ -2423,7 +2438,7 @@ msgstr "" #: libraries/config/messages.inc.php:26 msgid "Highlight selected rows" -msgstr "" +msgstr "توضيح الصفوف المختارة" #: libraries/config/messages.inc.php:27 msgid "Row marker" @@ -2431,21 +2446,23 @@ msgstr "" #: libraries/config/messages.inc.php:28 msgid "Highlight row pointed by the mouse cursor" -msgstr "" +msgstr "توضيح الصفوف المشار إليها بمؤشر الفأرة" #: libraries/config/messages.inc.php:29 msgid "Highlight pointer" -msgstr "" +msgstr "توضيح المؤشر" #: libraries/config/messages.inc.php:30 msgid "" "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " "import and export operations" msgstr "" +"تفعيل ضغط [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] لعمليات التصدير " +"والإستيراد" #: libraries/config/messages.inc.php:31 msgid "Bzip2" -msgstr "" +msgstr "Bzip2" #: libraries/config/messages.inc.php:32 msgid "" @@ -2453,30 +2470,32 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" +"يعرف أي أدوات التعديل تستخدم مع الأعمدة CHAR و VARCHAR ,,[kbd]input[/kbd] - " +"تسمح بمدخل محدود الطول ,, [kbd]textarea[/kbd] - تسمح بتعدد الأسطر في العمود. " #: libraries/config/messages.inc.php:33 msgid "CHAR columns editing" -msgstr "" +msgstr "تعديل أعمدة CHAR" #: libraries/config/messages.inc.php:34 msgid "Number of columns for CHAR/VARCHAR textareas" -msgstr "" +msgstr "عدد أعمدة مربع النص لـCHAR/VARCHAR" #: libraries/config/messages.inc.php:35 msgid "CHAR textarea columns" -msgstr "" +msgstr "أعمدة مربع النص لـ CHAR" #: libraries/config/messages.inc.php:36 msgid "Number of rows for CHAR/VARCHAR textareas" -msgstr "" +msgstr "عدد صفوف مربع النص لـCHAR/VARCHAR" #: libraries/config/messages.inc.php:37 msgid "CHAR textarea rows" -msgstr "" +msgstr "صفوف مربع النص لـ CHAR" #: libraries/config/messages.inc.php:38 msgid "Check config file permissions" -msgstr "" +msgstr "تحقق من أذونات ملف التكوين" #: libraries/config/messages.inc.php:39 msgid "" @@ -2486,26 +2505,27 @@ msgstr "" #: libraries/config/messages.inc.php:40 msgid "Compress on the fly" -msgstr "" +msgstr "ضغط" #: libraries/config/messages.inc.php:41 setup/frames/config.inc.php:25 #: setup/frames/index.inc.php:153 msgid "Configuration file" -msgstr "" +msgstr "ملف التكوين" #: libraries/config/messages.inc.php:42 msgid "" "Whether a warning ("Are your really sure...") should be displayed " "when you're about to lose data" msgstr "" +"التحذير (" هل أنت متأكد " ) يظهر عندما تكون على وشك فقدان بيانات" #: libraries/config/messages.inc.php:43 msgid "Confirm DROP queries" -msgstr "" +msgstr "تأكيد إستعلامات DROP" #: libraries/config/messages.inc.php:44 msgid "Debug SQL" -msgstr "" +msgstr "تصحيح SQL" #: libraries/config/messages.inc.php:45 #, fuzzy @@ -2518,62 +2538,64 @@ msgid "" "[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates " "maximum number for which vertical model is used" msgstr "" +"[kbd]أفقي[/kbd] , [kbd]رأسي[/kbd] أو عدد يشير إلى أكبر عدد من الأعمدة " +"يستعمله النموذج" #: libraries/config/messages.inc.php:47 msgid "Display direction for altering/creating columns" -msgstr "" +msgstr "عرض الإتجاه لـ تعديل/إنشاء الأعمدة" #: libraries/config/messages.inc.php:48 msgid "Tab that is displayed when entering a database" -msgstr "" +msgstr "التبويب الذي يعرض عند الدخول إلى قاعدة البيانات" #: libraries/config/messages.inc.php:49 msgid "Default database tab" -msgstr "" +msgstr "تبويب قاعدة البيانات الإفتراضي" #: libraries/config/messages.inc.php:50 msgid "Tab that is displayed when entering a server" -msgstr "" +msgstr "التبويب الذي يعرض عند الدخول إلى الخادم" #: libraries/config/messages.inc.php:51 msgid "Default server tab" -msgstr "" +msgstr "تبويب الخادم الإفتراضي" #: libraries/config/messages.inc.php:52 msgid "Tab that is displayed when entering a table" -msgstr "" +msgstr "التبويب الذي يعرض عند الدخول إلى الجدول" #: libraries/config/messages.inc.php:53 msgid "Default table tab" -msgstr "" +msgstr "تبويب الجدول الإفتراضي" #: libraries/config/messages.inc.php:54 msgid "Show binary contents as HEX by default" -msgstr "" +msgstr "عرض البيانات الثنائية بالنظام الست عشري إفتراضياً" #: libraries/config/messages.inc.php:55 libraries/display_tbl.lib.php:590 msgid "Show binary contents as HEX" -msgstr "" +msgstr "عرض البيانات الثنائية بالنظام الست عشري" #: libraries/config/messages.inc.php:56 msgid "Show database listing as a list instead of a drop down" -msgstr "" +msgstr "إظهار قواعد البيانات كقائمة بدلاً من القائمة المنسدلة" #: libraries/config/messages.inc.php:57 msgid "Display databases as a list" -msgstr "" +msgstr "إظهار قواعد البيانات كقائمة" #: libraries/config/messages.inc.php:58 msgid "Show server listing as a list instead of a drop down" -msgstr "" +msgstr "إظهار الخوادم كقائمة بدلاً من القائمة المنسدلة" #: libraries/config/messages.inc.php:59 msgid "Display servers as a list" -msgstr "" +msgstr "إظهار الخوادم كقائمة" #: libraries/config/messages.inc.php:60 msgid "Edit SQL queries in popup window" -msgstr "" +msgstr "تعديل إستعلام SQL في نافذة منبثقة" #: libraries/config/messages.inc.php:61 #, fuzzy @@ -2595,7 +2617,7 @@ msgstr "أخطاء." #: libraries/config/messages.inc.php:64 msgid "Show icons for warning, error and information messages" -msgstr "" +msgstr "عرض الأيقونات لرسائل التحذير, الخطأ والمعلومات" #: libraries/config/messages.inc.php:65 #, fuzzy @@ -2607,11 +2629,11 @@ msgstr "أخطاء." msgid "" "Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no " "limit)" -msgstr "" +msgstr "ضع الوقت المحدد لعمل البرنامج ([kbd]0[/kbd]: لانهائي)" #: libraries/config/messages.inc.php:67 msgid "Maximum execution time" -msgstr "" +msgstr "وقت التنفيذ الأقصى" #: libraries/config/messages.inc.php:68 prefs_manage.php:299 msgid "Save as file" @@ -2619,7 +2641,7 @@ msgstr "حفظ كملف" #: libraries/config/messages.inc.php:69 libraries/config/messages.inc.php:237 msgid "Character set of the file" -msgstr "" +msgstr "مجموعة الأحرف للملف" #: libraries/config/messages.inc.php:70 libraries/config/messages.inc.php:86 #: tbl_printview.php:373 tbl_structure.php:831 @@ -2670,7 +2692,7 @@ msgstr "استبدل NULL بـ" #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:82 msgid "Remove CRLF characters within columns" -msgstr "" +msgstr "حذف CRLF من الأعمدة" #: libraries/config/messages.inc.php:77 libraries/config/messages.inc.php:243 #: libraries/config/messages.inc.php:251 libraries/import/csv.php:62 @@ -2693,15 +2715,15 @@ msgstr "إصدارة إكسل" #: libraries/config/messages.inc.php:83 msgid "Database name template" -msgstr "" +msgstr "إسم قالب قاعدة البيانات" #: libraries/config/messages.inc.php:84 msgid "Server name template" -msgstr "" +msgstr "إسم قالب الخادم" #: libraries/config/messages.inc.php:85 msgid "Table name template" -msgstr "" +msgstr "إسم قالب الجدول" #: libraries/config/messages.inc.php:89 libraries/config/messages.inc.php:102 #: libraries/config/messages.inc.php:111 libraries/config/messages.inc.php:135 @@ -2750,7 +2772,7 @@ msgstr "نوع التصدير" #: libraries/config/messages.inc.php:112 libraries/config/messages.inc.php:114 msgid "Save on server" -msgstr "" +msgstr "حفظ في الخادم" #: libraries/config/messages.inc.php:113 libraries/config/messages.inc.php:115 #: libraries/display_export.lib.php:195 libraries/display_export.lib.php:221 @@ -2759,7 +2781,7 @@ msgstr "خزن على الملفات الموجودة أصلا" #: libraries/config/messages.inc.php:116 msgid "Remember file name template" -msgstr "" +msgstr "تذكر إسم قالب الملف" #: libraries/config/messages.inc.php:118 #, fuzzy @@ -2770,11 +2792,11 @@ msgstr "حماية أسماء الجداول و الحقول ب \"`\" " #: libraries/config/messages.inc.php:119 libraries/config/messages.inc.php:258 #: libraries/display_export.lib.php:353 msgid "SQL compatibility mode" -msgstr "" +msgstr "وضع توافق SQL" #: libraries/config/messages.inc.php:120 libraries/config/messages.inc.php:130 msgid "Syntax to use when inserting data" -msgstr "" +msgstr "بناء الجملة لإستخدامه عند إدخال البيانات" #: libraries/config/messages.inc.php:121 msgid "Creation/Update/Check dates" @@ -2786,11 +2808,11 @@ msgstr "استخدم الإضافات المتأخرة" #: libraries/config/messages.inc.php:123 libraries/export/sql.php:53 msgid "Disable foreign key checks" -msgstr "" +msgstr "تعطيل التحقق من المفتاح الغريب" #: libraries/config/messages.inc.php:126 msgid "Use hexadecimal for BLOB" -msgstr "" +msgstr "إستخدم النظام الست عشري لـ BLOB" #: libraries/config/messages.inc.php:128 #, fuzzy @@ -2800,7 +2822,7 @@ msgstr "استخدم الإضافات المتأخرة" #: libraries/config/messages.inc.php:131 libraries/export/sql.php:163 msgid "Maximal length of created query" -msgstr "" +msgstr "أقصى طول للإستعلام المنشئ" #: libraries/config/messages.inc.php:136 #, fuzzy @@ -2810,19 +2832,19 @@ msgstr "تصدير" #: libraries/config/messages.inc.php:137 libraries/export/sql.php:50 msgid "Enclose export in a transaction" -msgstr "" +msgstr "تضمين التصدير في العملية" #: libraries/config/messages.inc.php:138 msgid "Export time in UTC" -msgstr "" +msgstr "وقت التصدير (بالتوقيت العالمي)" #: libraries/config/messages.inc.php:146 msgid "Force secured connection while using phpMyAdmin" -msgstr "" +msgstr "فرض الإتصال الآمن عند إستخدام phpMyAdmin" #: libraries/config/messages.inc.php:147 msgid "Force SSL connection" -msgstr "" +msgstr "فرض إتصال SSL" #: libraries/config/messages.inc.php:148 msgid "" @@ -2832,30 +2854,30 @@ msgstr "" #: libraries/config/messages.inc.php:149 msgid "Foreign key dropdown order" -msgstr "" +msgstr "قائمة منسدلة مرتبة بالمفتاح الغريب" #: libraries/config/messages.inc.php:150 msgid "A dropdown will be used if fewer items are present" -msgstr "" +msgstr "سيتم إستخدام القائمة المنسدلة إذا وجد عدد أقل من العناصر" #: libraries/config/messages.inc.php:151 msgid "Foreign key limit" -msgstr "" +msgstr "حد المفتاح الغريب" #: libraries/config/messages.inc.php:152 msgid "Browse mode" -msgstr "" +msgstr "وضع الإستعراض" #: libraries/config/messages.inc.php:153 msgid "Customize browse mode" -msgstr "" +msgstr "تخصيص وضع الإستعراض" #: libraries/config/messages.inc.php:155 libraries/config/messages.inc.php:157 #: libraries/config/messages.inc.php:174 libraries/config/messages.inc.php:185 #: libraries/config/messages.inc.php:187 libraries/config/messages.inc.php:215 #: libraries/config/messages.inc.php:227 msgid "Customize default options" -msgstr "" +msgstr "تخصيص الخيارات الإفتراضية" #: libraries/config/messages.inc.php:156 libraries/config/setup.forms.php:232 #: libraries/config/setup.forms.php:311 @@ -2867,32 +2889,32 @@ msgstr "سي إس في" #: libraries/config/messages.inc.php:158 msgid "Developer" -msgstr "" +msgstr "مطور" #: libraries/config/messages.inc.php:159 msgid "Settings for phpMyAdmin developers" -msgstr "" +msgstr "إعدادات لمطوري phpMyAdmin" #: libraries/config/messages.inc.php:160 msgid "Edit mode" -msgstr "" +msgstr "وضع التعديل" #: libraries/config/messages.inc.php:161 msgid "Customize edit mode" -msgstr "" +msgstr "تخصيص وضع التعديل" #: libraries/config/messages.inc.php:163 msgid "Export defaults" -msgstr "" +msgstr "إفتراضيات التصدير" #: libraries/config/messages.inc.php:164 msgid "Customize default export options" -msgstr "" +msgstr "تخصيص خيارات التصدير الإفتراضي" #: libraries/config/messages.inc.php:165 libraries/config/messages.inc.php:207 #: setup/frames/menu.inc.php:16 msgid "Features" -msgstr "" +msgstr "مميزات" #: libraries/config/messages.inc.php:166 #, fuzzy @@ -2902,7 +2924,7 @@ msgstr "ولد" #: libraries/config/messages.inc.php:167 msgid "Set some commonly used options" -msgstr "" +msgstr "تعيين بعض الخيارات شائعة الإستخدام" #: libraries/config/messages.inc.php:168 libraries/db_links.inc.php:83 #: libraries/server_links.inc.php:73 libraries/tbl_links.inc.php:82 @@ -2912,19 +2934,19 @@ msgstr "استورد" #: libraries/config/messages.inc.php:169 msgid "Import defaults" -msgstr "" +msgstr "إفتراضيات الإستيراد" #: libraries/config/messages.inc.php:170 msgid "Customize default common import options" -msgstr "" +msgstr "تخصيص خيارات الإستيراد الإفتراضية" #: libraries/config/messages.inc.php:171 msgid "Import / export" -msgstr "" +msgstr "إستيراد / تصدير" #: libraries/config/messages.inc.php:172 msgid "Set import and export directories and compression options" -msgstr "" +msgstr "حدد عناوين الإستيراد والتصدير و خيارات الضغط" #: libraries/config/messages.inc.php:173 libraries/export/latex.php:26 msgid "LaTeX" @@ -2932,15 +2954,15 @@ msgstr "لاتكس" #: libraries/config/messages.inc.php:176 msgid "Databases display options" -msgstr "" +msgstr "خيارات عرض قواعد البيانات" #: libraries/config/messages.inc.php:177 setup/frames/menu.inc.php:18 msgid "Navigation frame" -msgstr "" +msgstr "إطار التصفح" #: libraries/config/messages.inc.php:178 msgid "Customize appearance of the navigation frame" -msgstr "" +msgstr "تخصيص مظهر إطار التصفح" #: libraries/config/messages.inc.php:179 libraries/select_server.lib.php:42 #: setup/frames/index.inc.php:98 @@ -2949,19 +2971,19 @@ msgstr "خوادم" #: libraries/config/messages.inc.php:180 msgid "Servers display options" -msgstr "" +msgstr "خيارات عرض الخوادم" #: libraries/config/messages.inc.php:182 msgid "Tables display options" -msgstr "" +msgstr "خيارات عرض الجداول" #: libraries/config/messages.inc.php:183 setup/frames/menu.inc.php:19 msgid "Main frame" -msgstr "" +msgstr "الإطار الرئيسي" #: libraries/config/messages.inc.php:184 msgid "Microsoft Office" -msgstr "" +msgstr "مايكروسوفت أوفيس" #: libraries/config/messages.inc.php:186 #, fuzzy @@ -2971,11 +2993,11 @@ msgstr "مستندات وثائقية" #: libraries/config/messages.inc.php:188 msgid "Other core settings" -msgstr "" +msgstr "الإعدادات الرئيسية الأخرى" #: libraries/config/messages.inc.php:189 msgid "Settings that didn't fit enywhere else" -msgstr "" +msgstr "الإعدادات التي لاتناسب في أي مكان آخر" #: libraries/config/messages.inc.php:190 #, fuzzy @@ -2999,21 +3021,22 @@ msgstr "نافذة الاستعلام" #: libraries/config/messages.inc.php:193 msgid "Customize query window options" -msgstr "" +msgstr "تخصيص خيارات نافذة الإستعلام" #: libraries/config/messages.inc.php:194 msgid "Security" -msgstr "" +msgstr "الأمان" #: libraries/config/messages.inc.php:195 msgid "" "Please note that phpMyAdmin is just a user interface and its features do not " "limit MySQL" msgstr "" +"فضلاً , تذكر أن phpMyAdmin هي واجة إستخدام فقط ولا يمكن أن تتجاوز حدود MySQL" #: libraries/config/messages.inc.php:196 msgid "Basic settings" -msgstr "" +msgstr "الإعدادات الأساسية" #: libraries/config/messages.inc.php:197 #, fuzzy @@ -3023,25 +3046,25 @@ msgstr "مستندات وثائقية" #: libraries/config/messages.inc.php:198 msgid "Authentication settings" -msgstr "" +msgstr "خيارات المصادقة" #: libraries/config/messages.inc.php:199 msgid "Server configuration" -msgstr "" +msgstr "إعداد الخادم" #: libraries/config/messages.inc.php:200 msgid "" "Advanced server configuration, do not change these options unless you know " "what they are for" -msgstr "" +msgstr "إعداد متقدم للخادم , لاتغير أي من هذه القيم حتى تعلم وظيفتها" #: libraries/config/messages.inc.php:201 msgid "Enter server connection parameters" -msgstr "" +msgstr "أدخل معلومات إتصال الخادم" #: libraries/config/messages.inc.php:202 msgid "Configuration storage" -msgstr "" +msgstr "إعداد التخزين" #: libraries/config/messages.inc.php:203 msgid "" @@ -5530,7 +5553,7 @@ msgstr "أوامر" #: libraries/export/sql.php:111 msgid "<code>CREATE TABLE</code> options:" -msgstr "" +msgstr "خيارات <code>CREATE TABLE</code> :" #: libraries/export/sql.php:123 msgid "" @@ -9539,7 +9562,7 @@ msgstr "" #: tbl_row_action.php:28 msgid "No rows selected" -msgstr "" +msgstr "لايوجد صفوف مختارة" #: tbl_select.php:109 msgid "Do a \"query by example\" (wildcard: \"%\")" diff --git a/po/az.po b/po/az.po index a0aa29e..e819b1b 100644 --- a/po/az.po +++ b/po/az.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" @@ -100,7 +100,7 @@ msgstr "" #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" -msgstr "" +msgstr "Uzaqdaki linke qosula bilmedim " #: changelog.php:32 license.php:28 #, php-format @@ -108,6 +108,8 @@ msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." msgstr "" +"%s fayli systemde yoxdur,zehmet olmasa www.phpmyadmin.net saytini ziyaret " +"edin" #: db_create.php:58 #, fuzzy, php-format diff --git a/po/be.po b/po/be.po index 827547e..7859752 100644 --- a/po/be.po +++ b/po/be.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" diff --git a/po/be(a)latin.po b/po/be(a)latin.po index 71269b4..2316236 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-30 23:09+0200\n" diff --git a/po/bg.po b/po/bg.po index 5506756..c3c1638 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-22 12:51+0200\n" @@ -1597,7 +1597,7 @@ msgstr "Прегледът не е достъпен." #: libraries/Theme.class.php:383 msgid "take it" -msgstr "" +msgstr "взимам я" #: libraries/Theme_Manager.class.php:109 #, php-format @@ -1636,6 +1636,8 @@ msgid "" "You probably did not create a configuration file. You might want to use the " "%1$ssetup script%2$s to create one." msgstr "" +"Изглежда не се създали конфигурационен файл. Вероятно ще искате да " +"използвате %1$sскрипта за настройки%2$s, за да го създадете" #: libraries/auth/config.auth.lib.php:115 msgid "" @@ -2704,11 +2706,11 @@ msgstr "" #: libraries/config/messages.inc.php:152 msgid "Browse mode" -msgstr "" +msgstr "Преглеждане" #: libraries/config/messages.inc.php:153 msgid "Customize browse mode" -msgstr "" +msgstr "Персонализиране на преглеждането" #: libraries/config/messages.inc.php:155 libraries/config/messages.inc.php:157 #: libraries/config/messages.inc.php:174 libraries/config/messages.inc.php:185 @@ -2735,11 +2737,11 @@ msgstr "Настройки за разработчици на phpMyAdmin" #: libraries/config/messages.inc.php:160 msgid "Edit mode" -msgstr "" +msgstr "Редактиране" #: libraries/config/messages.inc.php:161 msgid "Customize edit mode" -msgstr "" +msgstr "Персонализиране на редактирането" #: libraries/config/messages.inc.php:163 msgid "Export defaults" @@ -2760,7 +2762,7 @@ msgstr "Общи" #: libraries/config/messages.inc.php:167 msgid "Set some commonly used options" -msgstr "" +msgstr "Настройки на някои често използвани опции" #: libraries/config/messages.inc.php:168 libraries/db_links.inc.php:83 #: libraries/server_links.inc.php:73 libraries/tbl_links.inc.php:82 @@ -2843,6 +2845,9 @@ msgid "" "html#cfg_TitleTable]documentation[/a] for magic strings that can be used to " "get special values." msgstr "" +"Настройте заглавието в браузъра. Прочетете [a@Documentation." +"html#cfg_TitleTable]документацията[/a] за магическите низове и техните " +"стойности." #: libraries/config/messages.inc.php:192 #: libraries/navigation_header.inc.php:83 @@ -2939,11 +2944,11 @@ msgstr "" #: libraries/config/messages.inc.php:214 msgid "Customize links shown in SQL Query boxes" -msgstr "" +msgstr "Персонализиране на връзките показвани след изпълнение на заявка" #: libraries/config/messages.inc.php:217 msgid "SQL queries settings" -msgstr "" +msgstr "Настройки на SQL заявките" #: libraries/config/messages.inc.php:218 msgid "SQL Validator" @@ -2979,7 +2984,7 @@ msgstr "Текстови полета" #: libraries/config/messages.inc.php:225 msgid "Customize text input fields" -msgstr "" +msgstr "Персонализиране на текстовите полета" #: libraries/config/messages.inc.php:226 libraries/export/texytext.php:17 msgid "Texy! text" @@ -2991,7 +2996,7 @@ msgstr "Предупреждения" #: libraries/config/messages.inc.php:229 msgid "Disable some of the warnings shown by phpMyAdmin" -msgstr "" +msgstr "Скрива някои от предупрежденията, показвани от phpMyAdmin" #: libraries/config/messages.inc.php:230 msgid "" @@ -3241,11 +3246,11 @@ msgstr "" #: libraries/config/messages.inc.php:298 msgid "Double size of textarea for LONGTEXT columns" -msgstr "" +msgstr "Двойни текстови полета за колони тип LONGTEXT" #: libraries/config/messages.inc.php:299 msgid "Bigger textarea for LONGTEXT" -msgstr "" +msgstr "По-голямо текстово поле за LONGTEXT" #: libraries/config/messages.inc.php:300 msgid "Use icons on main page" @@ -3907,7 +3912,7 @@ msgstr "" #: libraries/config/messages.inc.php:452 msgid "Show SQL queries" -msgstr "" +msgstr "Показване на SQL заявките" #: libraries/config/messages.inc.php:453 msgid "Allow to display database and table statistics (eg. space usage)" @@ -4013,7 +4018,7 @@ msgstr "" #: libraries/config/messages.inc.php:478 msgid "Textarea columns" -msgstr "" +msgstr "Колони в текство поле" #: libraries/config/messages.inc.php:479 msgid "" @@ -4023,7 +4028,7 @@ msgstr "" #: libraries/config/messages.inc.php:480 msgid "Textarea rows" -msgstr "" +msgstr "Реда в текстово поле" #: libraries/config/messages.inc.php:481 msgid "Title of browser window when a database is selected" @@ -4100,7 +4105,7 @@ msgstr "" #: libraries/config/messages.inc.php:500 msgid "Enables check for latest version on main phpMyAdmin page" -msgstr "" +msgstr "Позволява проверка за обновления на страницата на phpMyAdmin." #: libraries/config/messages.inc.php:501 setup/lib/index.lib.php:118 #: setup/lib/index.lib.php:125 setup/lib/index.lib.php:142 @@ -4108,7 +4113,7 @@ msgstr "" #: setup/l4113,7 @@ msgstr ""etup/lib/index.lib.php:142.php:118на страницата на phpMyAdmin."заявка""ف "(/'/g,"''") + "'" + ' AND ';',', $values))); ?>">es=<?php echo urlencode(join(",", $values)); ?>">��NK�*P�m� �m��J�*6 ��!�!��m�@�m�x4,K�*P�m�"�J�*�J�*��m��J�*�m��/�K�*�J�* �K�*�$�K�*�)�K�*�J�*x4,K�*P�m� �m��J�*�!�!��m�@�m��K�*0�m�"�J�*�J�*��m��J�*�m��m��m��0J�*�p�@�m��J�*�J�*0�m��m��J�*GHIJKMNOP��m�@�m�H��J�*йm�"�J�*�J�*��m�0/�K�*�J�*@,K�*��J�* �K�*�$�K�*�)�K�*�J�*H��J�*йm��m��J�*8��J�*йm�@�m��J�*(��J�*йm�p�m��J�*��J�*йm��m��J�* �.�K�*�J�*�)�K�* �m��8�J�*�J�*�$�K�*@�m�y8�J�*�J�* �K�*p�m�Z8�J�*�J�*��J�*@,K�*��J�* �K�*�D,K�*�$�K�*�)�K�*�J�*�-�J�*�m��m��J�*#%')*-.035678:<=��m�@�m�pk�J�*�m�"�J�*8O,K�*�J�*�D,K�*�I,K�*�J�*cf�VJ�*@�m�pk�J�*�m��m��J�*�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv�B\J�*��m�FP�K�*FP�K�*?�YJ�*@�m��m�`�m��VJ�*�J�*�0J�*��m�BP�K�*��m��m��,1J�*@�m��BP�K�*H�m��Jib/index.lib.php:161 setup/lib/index.lib.php:164 #: setup/lib/index.lib.php:200 msgid "Version check" -msgstr "" +msgstr "Проверка за обновления" #: libraries/config/messages.inc.php:502 msgid "" @@ -4515,7 +4520,7 @@ msgstr "" msgid "" "Please be patient, the file is being uploaded. Details about the upload are " "not available." -msgstr "" +msgstr "Файлът се качва, бъдете търпеливи. Не са налични повече подробности." #: libraries/display_import.lib.php:129 msgid "Importing into the current server" @@ -6542,6 +6547,8 @@ msgid "" "Your preferences will be saved for current session only. Storing them " "permanently requires %sphpMyAdmin configuration storage%s." msgstr "" +"Вашите настройки ще бъдат пазени само за текущата сесия. За да ги използвате " +"постоянно е необходимо %sконфигурационно хранилище%s." #: libraries/user_preferences.lib.php:142 msgid "Could not save configuration" @@ -6980,11 +6987,11 @@ msgstr "Импортиране на файлове" #: prefs_manage.php:245 msgid "Import from browser's storage" -msgstr "" +msgstr "Импорт от хранилището на браузъра" #: prefs_manage.php:248 msgid "Settings will be imported from your browser's local storage." -msgstr "" +msgstr "Настройки ще бъдат импортирани от локалното хранилище на браузъра." #: prefs_manage.php:254 msgid "You have no saved settings!" @@ -6996,7 +7003,7 @@ msgstr "Тази функционалност не се поддържа от в #: prefs_manage.php:263 msgid "Merge with current configuration" -msgstr "" +msgstr "Сливане с текущите настройки" #: prefs_manage.php:277 #, php-format @@ -7004,10 +7011,12 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" +"Имате достъп до още настройки, модифицирайки config.inc.php, примерно чрез " +"%sскрипта за настройки%s." #: prefs_manage.php:302 msgid "Save to browser's storage" -msgstr "" +msgstr "Запис в хранилището на браузъра" #: prefs_manage.php:306 msgid "Settings will be saved in your browser's local storage." @@ -7015,11 +7024,12 @@ msgstr "" #: prefs_manage.php:308 msgid "Existing settings will be overwritten!" -msgstr "" +msgstr "Съществуващи настройки ще бъдат презаписани!" #: prefs_manage.php:323 msgid "You can reset all your settings and restore them to default values." msgstr "" +"Може да изчистите настройките си до техните стойностите по подразбиране." #: querywindow.php:93 msgid "Import files" @@ -8564,6 +8574,8 @@ msgid "" "Target database will be completely synchronized with source database. Source " "database will remain unchanged." msgstr "" +"Целевата БД ще бъде напълно синхронизирана с изходната. Изходната БД ще " +"остане непроменена." #: server_variables.php:39 msgid "Server variables and settings" diff --git a/po/bn.po b/po/bn.po index 6851ce7..a4a53e6 100644 --- a/po/bn.po +++ b/po/bn.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-10-21 01:36+0200\n" diff --git a/po/bs.po b/po/bs.po index d0b2bf2..4080369 100644 --- a/po/bs.po +++ b/po/bs.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" diff --git a/po/ca.po b/po/ca.po index f9a08e7..434d4f1 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-23 09:57+0200\n" diff --git a/po/cs.po b/po/cs.po index e3dd226..69a060c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" diff --git a/po/cy.po b/po/cy.po index c68480b..373bca7 100644 --- a/po/cy.po +++ b/po/cy.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-06-07 20:23+0200\n" diff --git a/po/da.po b/po/da.po index 6e44fde..5e0d4e7 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-07 01:17+0200\n" @@ -96,7 +96,7 @@ msgstr "Brug denne værdi" #: bs_disp_as_mime_type.php:29 bs_play_media.php:35 #: libraries/blobstreaming.lib.php:331 msgid "No blob streaming server configured!" -msgstr "" +msgstr "Ingen blob streaming server konfigureret!" #: bs_disp_as_mime_type.php:35 msgid "Failed to fetch headers" @@ -112,6 +112,7 @@ msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." msgstr "" +"Filen %s er ikke tilgængelig, besøg www.phpmyadmin.net for mere information." #: db_create.php:58 #, php-format @@ -610,11 +611,11 @@ msgstr "Tabel %s er slettet" #: db_structure.php:293 tbl_create.php:295 msgid "Tracking is active." -msgstr "" +msgstr "Sporing er aktiv." #: db_structure.php:295 tbl_create.php:297 msgid "Tracking is not active." -msgstr "" +msgstr "Sporing er ikke aktiv." #: db_structure.php:379 libraries/display_tbl.lib.php:2043 #, php-format @@ -716,7 +717,7 @@ msgstr "Data Dictionary" #: db_tracking.php:79 msgid "Tracked tables" -msgstr "" +msgstr "Sporede tabeller" #: db_tracking.php:84 libraries/config/messages.inc.php:482 #: libraries/export/htmlword.php:89 libraries/export/latex.php:162 @@ -733,15 +734,15 @@ msgstr "Database" #: db_tracking.php:86 msgid "Last version" -msgstr "" +msgstr "Seneste version" #: db_tracking.php:87 tbl_tracking.php:588 msgid "Created" -msgstr "" +msgstr "Oprettet" #: db_tracking.php:88 tbl_tracking.php:589 msgid "Updated" -msgstr "" +msgstr "Opdateret" #: db_tracking.php:89 libraries/common.lib.php:1354 #: libraries/server_links.inc.php:50 server_processlist.php:71 @@ -758,49 +759,49 @@ msgstr "Handling" #: db_tracking.php:101 js/messages.php:34 msgid "Delete tracking data for this table" -msgstr "" +msgstr "Sletter sporingsdata for denne tabel." #: db_tracking.php:119 tbl_tracking.php:542 tbl_tracking.php:600 msgid "active" -msgstr "" +msgstr "aktiv" #: db_tracking.php:121 tbl_tracking.php:544 tbl_tracking.php:602 msgid "not active" -msgstr "" +msgstr "ikke aktiv" #: db_tracking.php:134 msgid "Versions" -msgstr "" +msgstr "Versioner" #: db_tracking.php:135 tbl_tracking.php:373 tbl_tracking.php:619 msgid "Tracking report" -msgstr "" +msgstr "Sporingsrapport" #: db_tracking.php:136 tbl_tracking.php:245 tbl_tracking.php:619 msgid "Structure snapshot" -msgstr "" +msgstr "Øjebliksbillede af struktur" #: db_tracking.php:181 msgid "Untracked tables" -msgstr "" +msgstr "Ikke-sporede tabeller" #: db_tracking.php:201 db_tracking.php:203 tbl_structure.php:622 #: tbl_structure.php:624 msgid "Track table" -msgstr "" +msgstr "Spor tabel" #: db_tracking.php:229 msgid "Database Log" -msgstr "" +msgstr "Database log" #: enum_editor.php:21 libraries/tbl_properties.inc.php:793 #, php-format msgid "Values for the column \"%s\"" -msgstr "" +msgstr "Værdier for kolonnen \"%s\"" #: enum_editor.php:22 libraries/tbl_properties.inc.php:794 msgid "Enter each value in a separate field." -msgstr "" +msgstr "Indtast hver værdi i et seperat felt." #: enum_editor.php:57 msgid "+ Restart insertion and add a new value" @@ -939,11 +940,11 @@ msgstr "" #: server_synchronize.php:738 server_synchronize.php:766 #: server_synchronize.php:794 server_synchronize.php:806 msgid "Click to select" -msgstr "" +msgstr "Klik for at vælge" #: js/messages.php:26 msgid "Click to unselect" -msgstr "" +msgstr "Klik for at fravælge" #: js/messages.php:27 libraries/import.lib.php:103 sql.php:195 msgid "\"DROP DATABASE\" statements are disabled." @@ -975,7 +976,7 @@ msgstr "Tillader indsættelse og erstatning af data." #: js/messages.php:36 msgid "Dropping Primary Key/Index" -msgstr "" +msgstr "Fjerner primærnøgle/indeks" #: js/messages.php:37 msgid "This operation could take a long time. Proceed anyway?" @@ -1041,7 +1042,7 @@ msgstr "Fjern valgte brugere" #: js/messages.php:56 libraries/tbl_properties.inc.php:792 #: tbl_tracking.php:245 tbl_tracking.php:373 msgid "Close" -msgstr "" +msgstr "Luk" #: js/messages.php:60 libraries/tbl_properties.inc.php:797 pmd_general.php:388 #: pmd_general.php:425 pmd_general.php:545 pmd_general.php:593 @@ -1051,7 +1052,7 @@ msgstr "Annuller" #: js/messages.php:63 msgid "Loading" -msgstr "" +msgstr "Indlæser" #: js/messages.php:64 #, fuzzy @@ -1061,7 +1062,7 @@ msgstr "Processer" #: js/messages.php:65 libraries/import/ods.php:80 msgid "Error in Processing Request" -msgstr "" +msgstr "Felj i udførsel af forespørgsel" #: js/messages.php:66 msgid "Dropping Column" @@ -1069,7 +1070,7 @@ msgstr "" #: js/messages.php:67 msgid "Adding Primary Key" -msgstr "" +msgstr "Tilføjer primær nøgle" #: js/messages.php:68 libraries/relation.lib.php:87 pmd_general.php:386 #: pmd_general.php:543 pmd_general.php:591 pmd_general.php:667 @@ -1196,7 +1197,7 @@ msgstr "Vælg felt der skal vises" #: js/messages.php:107 msgid "Add an option for column " -msgstr "" +msgstr "Tilføj mulighed for kolonne" #: js/messages.php:110 #, fuzzy @@ -1226,11 +1227,13 @@ msgid "" "A newer version of phpMyAdmin is available and you should consider " "upgrading. The newest version is %s, released on %s." msgstr "" +"En nyere version af phpMyAdmin er tilgængelig og du bør overveje at " +"opgradere. Den nyeste version er %s, udgivet den %s." #. l10n: Latest available phpMyAdmin version #: js/messages.php:120 msgid ", latest stable version:" -msgstr "" +msgstr ", seneste stabile version:" #. l10n: Display text for calendar close link #: js/messages.php:138 @@ -1269,7 +1272,7 @@ msgstr " Binært " #: js/messages.php:148 msgid "February" -msgstr "" +msgstr "februar" #: js/messages.php:149 #, fuzzy @@ -1307,7 +1310,7 @@ msgstr "aug" #: js/messages.php:155 msgid "September" -msgstr "" +msgstr "september" #: js/messages.php:156 #, fuzzy @@ -1317,11 +1320,11 @@ msgstr "okt" #: js/messages.php:157 msgid "November" -msgstr "" +msgstr "november" #: js/messages.php:158 msgid "December" -msgstr "" +msgstr "december" #. l10n: Short month name #: js/messages.php:162 libraries/common.lib.php:1569 @@ -1509,11 +1512,11 @@ msgstr "lør" #. l10n: Column header for week of the year in calendar #: js/messages.php:227 msgid "Wk" -msgstr "" +msgstr "uge" #: js/messages.php:229 msgid "Hour" -msgstr "" +msgstr "Time" #: js/messages.php:230 #, fuzzy @@ -1586,7 +1589,7 @@ msgstr "Unik" #: libraries/Index.class.php:444 tbl_tracking.php:317 msgid "Packed" -msgstr "" +msgstr "Pakket" #: libraries/Index.class.php:446 tbl_tracking.php:319 msgid "Cardinality" @@ -1594,7 +1597,7 @@ msgstr "Kardinalitet" #: libraries/Index.class.php:449 tbl_tracking.php:273 tbl_tracking.php:322 msgid "Comment" -msgstr "" +msgstr "Kommentar" #: libraries/Index.class.php:471 msgid "The primary key has been dropped" @@ -1611,6 +1614,8 @@ msgid "" "The indexes %1$s and %2$s seem to be equal and one of them could possibly be " "removed." msgstr "" +"Indeks %1$s ser ud til at være identisk med indeks %2$s, så et af dem kan " +"sikkert fjernes" #: libraries/List_Database.class.php:430 libraries/config/messages.inc.php:175 #: libraries/server_links.inc.php:42 server_databases.php:100 @@ -1768,6 +1773,8 @@ msgstr "phpMyAdmin dokumentation" #: libraries/auth/cookie.auth.lib.php:245 msgid "You can enter hostname/IP address and port separated by space." msgstr "" +"Du kan angive værtsnavn/IP adresse og port ved at adskille dem med et " +"mellemrum" #: libraries/auth/cookie.auth.lib.php:244 msgid "Server:" @@ -1794,6 +1801,8 @@ msgstr "Herefter skal cookies være slået til." msgid "" "Login without a password is forbidden by configuration (see AllowNoPassword)" msgstr "" +"Det er ifølge konfigurationen ikke tilladt at logge ind uden en adgangskkode " +"(se AllowNoPassword)" #: libraries/auth/cookie.auth.lib.php:648 #: libraries/auth/signon.auth.lib.php:226 @@ -1815,12 +1824,12 @@ msgstr "Forkert brugernavn/kodeord. Adgang nægtet." #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format msgid "File %s does not contain any key id" -msgstr "" +msgstr "Filen %s indeholder ikke noget nøgle-id" #: libraries/auth/swekey/swekey.auth.lib.php:157 #: libraries/auth/swekey/swekey.auth.lib.php:180 msgid "Hardware authentication failed" -msgstr "" +msgstr "Godkendelse af hardware mislykkedes" #: libraries/auth/swekey/swekey.auth.lib.php:166 msgid "No valid authentication key plugged" @@ -1828,11 +1837,11 @@ msgstr "" #: libraries/auth/swekey/swekey.auth.lib.php:202 msgid "Authenticating..." -msgstr "" +msgstr "Godkender..." #: libraries/blobstreaming.lib.php:241 msgid "PBMS error" -msgstr "" +msgstr "PBMS-fejl" #: libraries/blobstreaming.lib.php:267 #, fuzzy @@ -1842,36 +1851,36 @@ msgstr "MySQL forbindelses-sammenkøring" #: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" -msgstr "" +msgstr "PBMS hent BLOB info mislykkedes" #: libraries/blobstreaming.lib.php:320 msgid "get BLOB Content-Type failed" -msgstr "" +msgstr "hent BLOB Content-Type mislykkedes" #: libraries/blobstreaming.lib.php:347 msgid "View image" -msgstr "" +msgstr "Se billede" #: libraries/blobstreaming.lib.php:351 msgid "Play audio" -msgstr "" +msgstr "Afspil lyd" #: libraries/blobstreaming.lib.php:356 msgid "View video" -msgstr "" +msgstr "Se video" #: libraries/blobstreaming.lib.php:360 msgid "Download file" -msgstr "" +msgstr "Download fil" #: libraries/blobstreaming.lib.php:421 #, php-format msgid "Could not open file: %s" -msgstr "" +msgstr "Kunne ikke åbne filen %s" #: libraries/bookmark.lib.php:83 msgid "shared" -msgstr "" +msgstr "delt" #: libraries/build_html_for_db.lib.php:25 #: libraries/config/messages.inc.php:181 libraries/export/xml.php:36 @@ -1911,7 +1920,7 @@ msgstr "Ingen databaser" #: libraries/build_html_for_db.lib.php:130 msgid "Not replicated" -msgstr "" +msgstr "Ikke gentaget" #: libraries/build_html_for_db.lib.php:136 #, fuzzy @@ -2057,7 +2066,7 @@ msgstr "MySQL returnerede: " #: libraries/common.lib.php:1098 msgid "Failed to connect to SQL validator!" -msgstr "" +msgstr "Kunne ikke oprette forbindelse til SQL validator!" #: libraries/common.lib.php:1139 libraries/config/messages.inc.php:463 msgid "Explain SQL" @@ -2090,7 +2099,7 @@ msgstr "Validér SQL" #: libraries/common.lib.php:1265 msgid "Inline edit of this query" -msgstr "" +msgstr "Åben linje til redigering af forespørgslen" #: libraries/common.lib.php:1267 #, fuzzy @@ -2100,7 +2109,7 @@ msgstr "Lagre" #: libraries/common.lib.php:1334 libraries/common.lib.php:1350 msgid "Profiling" -msgstr "" +msgstr "Skitsering" #: libraries/common.lib.php:1355 libraries/tbl_triggers.lib.php:27 #: server_processlist.php:70 @@ -2218,7 +2227,7 @@ msgstr "Operationer" #: libraries/common.lib.php:2966 msgid "Browse your computer:" -msgstr "" +msgstr "Gennemse din computer" #: libraries/common.lib.php:2979 #, fuzzy, php-format @@ -2233,15 +2242,15 @@ msgstr "Mappen du har sat til upload-arbejde kan ikke findes" #: libraries/common.lib.php:2999 msgid "There are no files to upload" -msgstr "" +msgstr "Der er ikke nogen filer at uploade" #: libraries/config.values.php:45 libraries/config.values.php:50 msgid "Both" -msgstr "" +msgstr "Begge" #: libraries/config.values.php:74 msgid "Open" -msgstr "" +msgstr "Åben" #: libraries/config.values.php:74 #, fuzzy @@ -2254,7 +2263,7 @@ msgstr "Ikke-lukket quote" #: libraries/export/sql.php:79 libraries/export/texytext.php:23 #: libraries/import.lib.php:1172 msgid "structure" -msgstr "" +msgstr "struktur" #: libraries/config.values.php:96 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 @@ -2272,15 +2281,17 @@ msgstr "Struktur og data" #: libraries/config.values.php:99 msgid "Quick - display only the minimal options to configure" -msgstr "" +msgstr "Hurtig - vis kun de mest nødvendige konfigurationsmuligheder" #: libraries/config.values.php:100 msgid "Custom - display all possible options to configure" -msgstr "" +msgstr "Brugerdefineret - vis alle valgmuligheder for konfigurering" #: libraries/config.values.php:101 msgid "Custom - like above, but without the quick/custom choice" msgstr "" +"Brugerdefineret - som ovenfor, men uden valgmuligheder for hurtig/" +"brugerdefineret" #: libraries/config.values.php:119 #, fuzzy @@ -2296,43 +2307,43 @@ msgstr "Udvidede inserts" #: libraries/config.values.php:121 msgid "both of the above" -msgstr "" +msgstr "Begge de ovenfor anførte" #: libraries/config.values.php:122 msgid "neither of the above" -msgstr "" +msgstr "Ingen af de ovenfor anførte" #: libraries/config/FormDisplay.class.php:83 #: libraries/config/validate.lib.php:422 msgid "Not a positive number" -msgstr "" +msgstr "Ikke et positivt tal" #: libraries/config/FormDisplay.class.php:84 #: libraries/config/validate.lib.php:435 msgid "Not a non-negative number" -msgstr "" +msgstr "Ikke et ikke-negativt tal" #: libraries/config/FormDisplay.class.php:85 #: libraries/config/validate.lib.php:409 msgid "Not a valid port number" -msgstr "" +msgstr "Ikke et gyldigt port-nummer" #: libraries/config/FormDisplay.class.php:86 #: libraries/config/FormDisplay.class.php:574 #: libraries/config/validate.lib.php:360 libraries/config/validate.lib.php:450 msgid "Incorrect value" -msgstr "" +msgstr "Ukorrekt værdi" #: libraries/config/FormDisplay.class.php:87 #: libraries/config/validate.lib.php:464 #, php-format msgid "Value must be equal or lower than %s" -msgstr "" +msgstr "Værdien skal være mindre end eller lig med %s" #: libraries/config/FormDisplay.class.php:538 #, php-format msgid "Missing data for %s" -msgstr "" +msgstr "Manglende data for %s" #: libraries/config/FormDisplay.class.php:736 #: libraries/config/FormDisplay.class.php:740 @@ -2345,21 +2356,21 @@ msgstr "Variabel" #: libraries/config/FormDisplay.class.php:741 #, php-format msgid "\"%s\" requires %s extension" -msgstr "" +msgstr "\"%s\" er afhængig af udvidelsen %s" #: libraries/config/FormDisplay.class.php:755 #, php-format msgid "import will not work, missing function (%s)" -msgstr "" +msgstr "importeringen kommer ikke til at fungere, funktionen (%s) mangler" #: libraries/config/FormDisplay.class.php:759 #, php-format msgid "export will not work, missing function (%s)" -msgstr "" +msgstr "eksporten kommer ikke til at fungere, funktionen (%s) mangler" #: libraries/config/FormDisplay.class.php:766 msgid "SQL Validator is disabled" -msgstr "" +msgstr "SQL Validator er deaktiveret" #: libraries/config/FormDisplay.class.php:773 #, fuzzy @@ -2370,11 +2381,12 @@ msgstr "Link ikke fundet" #: libraries/config/FormDisplay.class.php:781 #, php-format msgid "maximum %s" -msgstr "" +msgstr "maksimum %s" #: libraries/config/FormDisplay.tpl.php:173 msgid "This setting is disabled, it will not be applied to your configuration" msgstr "" +"Denne indstilling er deaktiveret og din konfiguration vil ikke anvende den" #: libraries/config/FormDisplay.tpl.php:173 libraries/relation.lib.php:89 #: libraries/relation.lib.php:96 pmd_relation_new.php:68 @@ -2384,16 +2396,16 @@ msgstr "Slået fra" #: libraries/config/FormDisplay.tpl.php:248 #, php-format msgid "Set value: %s" -msgstr "" +msgstr "Indstil værdien %s" #: libraries/config/FormDisplay.tpl.php:253 #: libraries/config/messages.inc.php:351 msgid "Restore default value" -msgstr "" +msgstr "Gendan standardværdi" #: libraries/config/FormDisplay.tpl.php:269 msgid "Allow users to customize this value" -msgstr "" +msgstr "Tillad brugerdefinerede indstillinger for værdien" #: libraries/config/FormDisplay.tpl.php:333 #: libraries/schema/User_Schema.class.php:470 prefs_manage.php:320 @@ -2403,7 +2415,7 @@ msgstr "Nulstil" #: libraries/config/messages.inc.php:17 msgid "Improves efficiency of screen refresh" -msgstr "" +msgstr "Forbedrer ydeevnen for skærmopdatering" #: libraries/config/messages.inc.php:18 #, fuzzy @@ -2415,10 +2427,12 @@ msgstr "Slået til" msgid "" "If enabled user can enter any MySQL server in login form for cookie auth" msgstr "" +"Aktivering medfører, at brugeren kan tilgå en hvilken som helst MySQL-server " +"fra log ind-siden ved cookie-godkendelse" #: libraries/config/messages.inc.php:20 msgid "Allow login to any MySQL server" -msgstr "" +msgstr "Tillad log ind til en hvilken som helst MySQL-server" #: libraries/config/messages.inc.php:21 msgid "" @@ -2426,46 +2440,53 @@ msgid "" "inside a frame, and is a potential [strong]security hole[/strong] allowing " "cross-frame scripting attacks" msgstr "" +"Aktivering indebærer, at en side, som ligger på et andet domæne, har adgang " +"til at kalde phpMyAdmin fra en frame. Det er en potentiel sikkerhedsrisiko, " +"fordi det åbner op for cross-frame skripting angreb" #: libraries/config/messages.inc.php:22 msgid "Allow third party framing" -msgstr "" +msgstr "Tillad rammeværk fra tredjepart" #: libraries/config/messages.inc.php:23 msgid "Show "Drop database" link to normal users" -msgstr "" +msgstr "Vis linket "Drop database" til almindelige brugere" #: libraries/config/messages.inc.php:24 msgid "" "Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] " "authentication" msgstr "" +"Hemmeligt kodeordsudtryk til kryptering af cookies ved [kbd]cookie[/kbd] " +"godkendelse" #: libraries/config/messages.inc.php:25 msgid "Blowfish secret" -msgstr "" +msgstr "Blowfish hemmelighed" #: libraries/config/messages.inc.php:26 msgid "Highlight selected rows" -msgstr "" +msgstr "Fremhæv valgte rækker" #: libraries/config/messages.inc.php:27 msgid "Row marker" -msgstr "" +msgstr "Rækkemarkør" #: libraries/config/messages.inc.php:28 msgid "Highlight row pointed by the mouse cursor" -msgstr "" +msgstr "Fremhæv den række, som musemarkøren peger på" #: libraries/config/messages.inc.php:29 msgid "Highlight pointer" -msgstr "" +msgstr "Fremhæv pointer" #: libraries/config/messages.inc.php:30 msgid "" "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " "import and export operations" msgstr "" +"Aktivér komprimering af [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] ved " +"import -og eksport arbejdsgange" #: libraries/config/messages.inc.php:31 msgid "Bzip2" @@ -2477,59 +2498,67 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" +"Definerer typen af redigeringskontroller som skal anvendes i CHAR -og " +"VARCHAR-kolonner. [kbd]input[/kbd] - tillader begrænsning i længden af " +"input, [kbd]textarea[/kbd] - tillader linjeskift i kolonner" #: libraries/config/messages.inc.php:33 msgid "CHAR columns editing" -msgstr "" +msgstr "Redigering af CHAR-kolonner" #: libraries/config/messages.inc.php:34 msgid "Number of columns for CHAR/VARCHAR textareas" -msgstr "" +msgstr "Bredde på CHAR/VARCHAR tekstbokse" #: libraries/config/messages.inc.php:35 msgid "CHAR textarea columns" -msgstr "" +msgstr "Bredde på tekstbokse" #: libraries/config/messages.inc.php:36 msgid "Number of rows for CHAR/VARCHAR textareas" -msgstr "" +msgstr "Højde på CHAR/VARCHAR-tekstbokse" #: libraries/config/messages.inc.php:37 msgid "CHAR textarea rows" -msgstr "" +msgstr "Højde på CHAR-tekstbokse" #: libraries/config/messages.inc.php:38 msgid "Check config file permissions" -msgstr "" +msgstr "Tjek tilladelser på konfigurationsfil" #: libraries/config/messages.inc.php:39 msgid "" "Compress gzip/bzip2 exports on the fly without the need for much memory; if " "you encounter problems with created gzip/bzip2 files disable this feature" msgstr "" +"Pak gzip/bzip2-eksporter under eksporten uden behov for ret meget " +"hukommelse. Hvis du får problemer med de dannede gzip/bzip2-filer, så " +"deaktivér denne funktion" #: libraries/config/messages.inc.php:40 msgid "Compress on the fly" -msgstr "" +msgstr "Komprimér undervejs" #: libraries/config/messages.inc.php:41 setup/frames/config.inc.php:25 #: setup/frames/index.inc.php:153 msgid "Configuration file" -msgstr "" +msgstr "Konfigurationsfil" #: libraries/config/messages.inc.php:42 msgid "" "Whether a warning ("Are your really sure...") should be displayed " "when you're about to lose data" msgstr "" +"Hvorvidt der skal vises en advarsel ("Er du helt sikker...") , når " +"du er ved at miste data" #: libraries/config/messages.inc.php:43 msgid "Confirm DROP queries" -msgstr "" +msgstr "Bekræft DROP-forespørgsler" #: libraries/config/messages.inc.php:44 msgid "Debug SQL" -msgstr "" +msgstr "Ret fejl i SQL" #: libraries/config/messages.inc.php:45 #, fuzzy @@ -2542,62 +2571,64 @@ msgid "" "[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates " "maximum number for which vertical model is used" msgstr "" +"[kbd]horisontal[/kbd], [kbd]vertikal[/kbd] eller et tal, som angiver " +"maksimum for den anvendte vertikale model" #: libraries/config/messages.inc.php:47 msgid "Display direction for altering/creating columns" -msgstr "" +msgstr "Vis retning for kolonner, som redigeres/oprettes" #: libraries/config/messages.inc.php:48 msgid "Tab that is displayed when entering a database" -msgstr "" +msgstr "Fane der skal vises, når man går ind i en database" #: libraries/config/messages.inc.php:49 msgid "Default database tab" -msgstr "" +msgstr "Standard database-fane" #: libraries/config/messages.inc.php:50 msgid "Tab that is displayed when entering a server" -msgstr "" +msgstr "Fane, som skal vises, når man går ind på en server" #: libraries/config/messages.inc.php:51 msgid "Default server tab" -msgstr "" +msgstr "Standard server-fane" #: libraries/config/messages.inc.php:52 msgid "Tab that is displayed when entering a table" -msgstr "" +msgstr "Fane som skal vises, når man går ind i en tabel" #: libraries/config/messages.inc.php:53 msgid "Default table tab" -msgstr "" +msgstr "Standard tabel-fane" #: libraries/config/messages.inc.php:54 msgid "Show binary contents as HEX by default" -msgstr "" +msgstr "Som standard vises binært indhold som HEX" #: libraries/config/messages.inc.php:55 libraries/display_tbl.lib.php:590 msgid "Show binary contents as HEX" -msgstr "" +msgstr "Vis binært indhold som HEX" #: libraries/config/messages.inc.php:56 msgid "Show database listing as a list instead of a drop down" -msgstr "" +msgstr "Vis databaser på en liste i stedet for i en valgboks" #: libraries/config/messages.inc.php:57 msgid "Display databases as a list" -msgstr "" +msgstr "Vis databaser på en liste" #: libraries/config/messages.inc.php:58 msgid "Show server listing as a list instead of a drop down" -msgstr "" +msgstr "Vis servere på en liste i stedet for i en valgboks" #: libraries/config/messages.inc.php:59 msgid "Display servers as a list" -msgstr "" +msgstr "Vis servere på en liste" #: libraries/config/messages.inc.php:60 msgid "Edit SQL queries in popup window" -msgstr "" +msgstr "Redigér SQL-forespørgsler i et popup vindue" #: libraries/config/messages.inc.php:61 #, fuzzy @@ -2613,25 +2644,27 @@ msgstr "Vis muligheder" #: libraries/config/messages.inc.php:63 msgid "Gather errors" -msgstr "" +msgstr "Indsaml fejl" #: libraries/config/messages.inc.php:64 msgid "Show icons for warning, error and information messages" -msgstr "" +msgstr "Vis ikoner i advarsels-, fejl-, og informationsmeddelelser" #: libraries/config/messages.inc.php:65 msgid "Iconic errors" -msgstr "" +msgstr "Ikon-fejl" #: libraries/config/messages.inc.php:66 msgid "" "Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no " "limit)" msgstr "" +"Bestem antallet af sekunder, som et skript må være om at køre ([kbd]0[/kbd] " +"er lig med ingen tidsgrænse" #: libraries/config/messages.inc.php:67 msgid "Maximum execution time" -msgstr "" +msgstr "Maksimal ekspeditionstid" #: libraries/config/messages.inc.php:68 prefs_manage.php:299 msgid "Save as file" @@ -2639,7 +2672,7 @@ msgstr "Send (download)" #: libraries/config/messages.inc.php:69 libraries/config/messages.inc.php:237 msgid "Character set of the file" -msgstr "" +msgstr "Filens tegnsæt" #: libraries/config/messages.inc.php:70 libraries/config/messages.inc.php:86 #: tbl_printview.php:373 tbl_structure.php:831 @@ -2690,7 +2723,7 @@ msgstr "Erstat NULL med" #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:82 msgid "Remove CRLF characters within columns" -msgstr "" +msgstr "Fjern karakterer for linjeskift i felterne" #: libraries/config/messages.inc.php:77 libraries/config/messages.inc.php:243 #: libraries/config/messages.inc.php:251 libraries/import/csv.php:62 @@ -2713,15 +2746,15 @@ msgstr "Excel-udgave" #: libraries/config/messages.inc.php:83 msgid "Database name template" -msgstr "" +msgstr "Skabelon for databasenavn" #: libraries/config/messages.inc.php:84 msgid "Server name template" -msgstr "" +msgstr "Maske for servernavn" #: libraries/config/messages.inc.php:85 msgid "Table name template" -msgstr "" +msgstr "Maske for tabelnavn" #: libraries/config/messages.inc.php:89 libraries/config/messages.inc.php:102 #: libraries/config/messages.inc.php:111 libraries/config/messages.inc.php:135 @@ -2770,7 +2803,7 @@ msgstr "Eksporttype" #: libraries/config/messages.inc.php:112 libraries/config/messages.inc.php:114 msgid "Save on server" -msgstr "" +msgstr "Gem på server" #: libraries/config/messages.inc.php:113 libraries/config/messages.inc.php:115 #: libraries/display_export.lib.php:195 libraries/display_export.lib.php:221 @@ -2779,7 +2812,7 @@ msgstr "Overskriv eksisterende fil(er)" #: libraries/config/messages.inc.php:116 msgid "Remember file name template" -msgstr "" +msgstr "Husk maske for filnavn" #: libraries/config/messages.inc.php:118 #, fuzzy @@ -2794,7 +2827,7 @@ msgstr "SQL-kompatibilitetsmodus" #: libraries/config/messages.inc.php:120 libraries/config/messages.inc.php:130 msgid "Syntax to use when inserting data" -msgstr "" +msgstr "Syntaks som skal bruges, når der indsættes data" #: libraries/config/messages.inc.php:121 msgid "Creation/Update/Check dates" @@ -2832,41 +2865,43 @@ msgstr "Inkludér eksport i en transaktion" #: libraries/config/messages.inc.php:138 msgid "Export time in UTC" -msgstr "" +msgstr "Angiv eksporteringstidspunktet i UTC (Universal Time Coordinated)" #: libraries/config/messages.inc.php:146 msgid "Force secured connection while using phpMyAdmin" -msgstr "" +msgstr "Gennemtving sikker forbindelse mens phpMyAdmin bruges" #: libraries/config/messages.inc.php:147 msgid "Force SSL connection" -msgstr "" +msgstr "Gennemtving SSL-forbindelse" #: libraries/config/messages.inc.php:148 msgid "" "Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is " "the referenced data, [kbd]id[/kbd] is the key value" msgstr "" +"Sorteringsrækkefølge for elementer i valgboks med fremmede nøgler; [kbd]" +"content[/kbd] er de refererede data, [kbd]id[/kbd] er nøglens værdi" #: libraries/config/messages.inc.php:149 msgid "Foreign key dropdown order" -msgstr "" +msgstr "Sortër fremmede nøgler i valgboks på:" #: libraries/config/messages.inc.php:150 msgid "A dropdown will be used if fewer items are present" -msgstr "" +msgstr "Der vil blive brugt en valgboks, hvis der er færre elementer til stede" #: libraries/config/messages.inc.php:151 msgid "Foreign key limit" -msgstr "" +msgstr "Øvre grænse for fremmed nøgle" #: libraries/config/messages.inc.php:152 msgid "Browse mode" -msgstr "" +msgstr "Gennemsynstilstand" #: libraries/config/messages.inc.php:153 msgid "Customize browse mode" -msgstr "" +msgstr "Brugerindstilling for gennemsynstilstand" #: libraries/config/messages.inc.php:155 libraries/config/messages.inc.php:157 #: libraries/config/messages.inc.php:174 libraries/config/messages.inc.php:185 @@ -2887,32 +2922,32 @@ msgstr "CSV (kommasepareret)" #: libraries/config/messages.inc.php:158 msgid "Developer" -msgstr "" +msgstr "Udvikler" #: libraries/config/messages.inc.php:159 msgid "Settings for phpMyAdmin developers" -msgstr "" +msgstr "Indstillinger for phpMyAdmin udviklere" #: libraries/config/messages.inc.php:160 msgid "Edit mode" -msgstr "" +msgstr "Redigeringstilstand" #: libraries/config/messages.inc.php:161 msgid "Customize edit mode" -msgstr "" +msgstr "Tilpas redigerinstilstand" #: libraries/config/messages.inc.php:163 msgid "Export defaults" -msgstr "" +msgstr "Standardindstillinger for eksport" #: libraries/config/messages.inc.php:164 msgid "Customize default export options" -msgstr "" +msgstr "Tilpas standardindstillinger for eksport" #: libraries/config/messages.inc.php:165 libraries/config/messages.inc.php:207 #: setup/frames/menu.inc.php:16 msgid "Features" -msgstr "" +msgstr "Karakteristika" #: libraries/config/messages.inc.php:166 #, fuzzy @@ -2922,7 +2957,7 @@ msgstr "Generér" #: libraries/config/messages.inc.php:167 msgid "Set some commonly used options" -msgstr "" +msgstr "Bestem indstillinger for nogle af de mest anvendte valgmuligheder" #: libraries/config/messages.inc.php:168 libraries/db_links.inc.php:83 #: libraries/server_links.inc.php:73 libraries/tbl_links.inc.php:82 @@ -2932,19 +2967,21 @@ msgstr "Import" #: libraries/config/messages.inc.php:169 msgid "Import defaults" -msgstr "" +msgstr "Standarder for import" #: libraries/config/messages.inc.php:170 msgid "Customize default common import options" -msgstr "" +msgstr "Tilpas standardindstillinger for import" #: libraries/config/messages.inc.php:171 msgid "Import / export" -msgstr "" +msgstr "Import / eksport" #: libraries/config/messages.inc.php:172 msgid "Set import and export directories and compression options" msgstr "" +"Bestem indstillinger for importerings- og eksporteringsmapper samt " +"komprimering" #: libraries/config/messages.inc.php:173 libraries/export/latex.php:26 msgid "LaTeX" @@ -2952,15 +2989,15 @@ msgstr "LaTeX" #: libraries/config/messages.inc.php:176 msgid "Databases display options" -msgstr "" +msgstr "Indstillinger for visning af databaser" #: libraries/config/messages.inc.php:177 setup/frames/menu.inc.php:18 msgid "Navigation frame" -msgstr "" +msgstr "Navigationsramme" #: libraries/config/messages.inc.php:178 msgid "Customize appearance of the navigation frame" -msgstr "" +msgstr "Tilpas navigationsrammens udseende" #: libraries/config/messages.inc.php:179 libraries/select_server.lib.php:42 #: setup/frames/index.inc.php:98 @@ -2969,15 +3006,15 @@ msgstr "Servere" #: libraries/config/messages.inc.php:180 msgid "Servers display options" -msgstr "" +msgstr "Indstillinger for visning af servere" #: libraries/config/messages.inc.php:182 msgid "Tables display options" -msgstr "" +msgstr "Indstillinger for visning af tabeller" #: libraries/config/messages.inc.php:183 setup/frames/menu.inc.php:19 msgid "Main frame" -msgstr "" +msgstr "Hovedramme" #: libraries/config/messages.inc.php:184 msgid "Microsoft Office" @@ -2991,11 +3028,11 @@ msgstr "Open Document tekst" #: libraries/config/messages.inc.php:188 msgid "Other core settings" -msgstr "" +msgstr "Andre kerneindstillinger" #: libraries/config/messages.inc.php:189 msgid "Settings that didn't fit enywhere else" -msgstr "" +msgstr "Indstillinger som ikke passer ind andre steder" #: libraries/config/messages.inc.php:190 #, fuzzy @@ -3008,7 +3045,7 @@ msgid "" "Specify browser's title bar text. Refer to [a@Documentation." "html#cfg_TitleTable]documentation[/a] for magic strings that can be used to " "get special values." -msgstr "" +msgstr "Angiv browserens titeltekst. " #: libraries/config/messages.inc.php:192 #: libraries/navigation_header.inc.php:83 @@ -3019,21 +3056,23 @@ msgstr "Foresp. vindue" #: libraries/config/messages.inc.php:193 msgid "Customize query window options" -msgstr "" +msgstr "Tilpas indstillinger for forespørgselsvindue" #: libraries/config/messages.inc.php:194 msgid "Security" -msgstr "" +msgstr "Sikkerhed" #: libraries/config/messages.inc.php:195 msgid "" "Please note that phpMyAdmin is just a user interface and its features do not " "limit MySQL" msgstr "" +"Bemærk venligst at phpMyAdmin blot er en brugerflade, hvis egenskaber ikke " +"begrænser MySQL" #: libraries/config/messages.inc.php:196 msgid "Basic settings" -msgstr "" +msgstr "Grundlæggende indstillinger" #: libraries/config/messages.inc.php:197 #, fuzzy @@ -3043,25 +3082,27 @@ msgstr "Dokumentation" #: libraries/config/messages.inc.php:198 msgid "Authentication settings" -msgstr "" +msgstr "Indstillinger for godkendelse" #: libraries/config/messages.inc.php:199 msgid "Server configuration" -msgstr "" +msgstr "Serverkonfiguration" #: libraries/config/messages.inc.php:200 msgid "" "Advanced server configuration, do not change these options unless you know " "what they are for" msgstr "" +"Avanceret serverkonfiguration. Lad være med at ændre disse indstillinger med " +"mindre, du ved, hvad de betyder" #: libraries/config/messages.inc.php:201 msgid "Enter server connection parameters" -msgstr "" +msgstr "Indtast parametre for tilslutning til server" #: libraries/config/messages.inc.php:202 msgid "Configuration storage" -msgstr "" +msgstr "Lagring af konfiguration" #: libraries/config/messages.inc.php:203 msgid "" @@ -5600,7 +5641,7 @@ msgstr "Erklæringer" #: libraries/export/sql.php:111 msgid "<code>CREATE TABLE</code> options:" -msgstr "" +msgstr "Muligheder for <code>CREATE TABLE</code>:" #: libraries/export/sql.php:123 msgid "" @@ -9498,8 +9539,10 @@ msgid "Width" msgstr "" #: tbl_chart.php:94 +#, fuzzy +#| msgid "Right" msgid "Height" -msgstr "" +msgstr "Højre" #: tbl_chart.php:98 msgid "Title" diff --git a/po/de.po b/po/de.po index 9b505d2..ec9af7b 100644 --- a/po/de.po +++ b/po/de.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-23 04:28+0200\n" diff --git a/po/el.po b/po/el.po index 3610fcc..69cea61 100644 --- a/po/el.po +++ b/po/el.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-05 11:15+0200\n" diff --git a/po/en_GB.po b/po/en_GB.po index a5d899e..b37926d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 16:24+0200\n" diff --git a/po/es.po b/po/es.po index 914754c..076f3f1 100644 --- a/po/es.po +++ b/po/es.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-02 11:10+0200\n" diff --git a/po/et.po b/po/et.po index 14c8e96..107be8e 100644 --- a/po/et.po +++ b/po/et.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" diff --git a/po/eu.po b/po/eu.po index 33546e3..18723d1 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:53+0200\n" diff --git a/po/fa.po b/po/fa.po index 7ddf128..d632aca 100644 --- a/po/fa.po +++ b/po/fa.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-05-19 03:54+0200\n" diff --git a/po/fi.po b/po/fi.po index a52bb00..fb6cf9e 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-11-26 21:29+0200\n" @@ -1781,7 +1781,7 @@ msgstr "Tiedostoa ei voida avata: %s" #: libraries/bookmark.lib.php:83 msgid "shared" -msgstr "" +msgstr "jaettu" #: libraries/build_html_for_db.lib.php:25 #: libraries/config/messages.inc.php:181 libraries/export/xml.php:36 @@ -2131,11 +2131,11 @@ msgstr "Lähetettäviä tiedostoja ei ole" #: libraries/config.values.php:45 libraries/config.values.php:50 msgid "Both" -msgstr "" +msgstr "Molemmat" #: libraries/config.values.php:74 msgid "Open" -msgstr "" +msgstr "Avaa" #: libraries/config.values.php:74 #, fuzzy @@ -2801,11 +2801,11 @@ msgstr "CSV" #: libraries/config/messages.inc.php:158 msgid "Developer" -msgstr "" +msgstr "Kehittäjä" #: libraries/config/messages.inc.php:159 msgid "Settings for phpMyAdmin developers" -msgstr "" +msgstr "Asetukset phpMyAdmin-kehittäjille" #: libraries/config/messages.inc.php:160 msgid "Edit mode" @@ -3101,7 +3101,7 @@ msgstr "Varoitus" #: libraries/config/messages.inc.php:229 msgid "Disable some of the warnings shown by phpMyAdmin" -msgstr "" +msgstr "Kytke osa phpMyAdminin näyttämistä varoituksista pois päältä" #: libraries/config/messages.inc.php:230 msgid "" @@ -3589,7 +3589,7 @@ msgstr "Oletusarvoinen kyselyikkunavälilehti" #: libraries/config/messages.inc.php:341 msgid "Query window height (in pixels)" -msgstr "" +msgstr "Kyselyikkunan korkeus (pikseleissä)" #: libraries/config/messages.inc.php:342 #, fuzzy @@ -9310,7 +9310,7 @@ msgstr "Seuraavat kyselyt on suoritettu:" #: server_synchronize.php:1130 msgid "Enter manually" -msgstr "" +msgstr "Syötä käsin" #: server_synchronize.php:1138 #, fuzzy @@ -9850,8 +9850,10 @@ msgid "Width" msgstr "" #: tbl_chart.php:94 +#, fuzzy +#| msgid "Right" msgid "Height" -msgstr "" +msgstr "Oikea" #: tbl_chart.php:98 msgid "Title" diff --git a/po/fr.po b/po/fr.po index 4825272..071390b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 19:23+0200\n" diff --git a/po/gl.po b/po/gl.po index dcc97ab..fc30353 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:50+0200\n" diff --git a/po/he.po b/po/he.po index b7f8de9..074f895 100644 --- a/po/he.po +++ b/po/he.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-02 20:17+0200\n" diff --git a/po/hi.po b/po/hi.po index 6e86b9a..06341d6 100644 --- a/po/hi.po +++ b/po/hi.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-24 00:23+0200\n" diff --git a/po/hr.po b/po/hr.po index ba20f43..d6b2ef2 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:54+0200\n" diff --git a/po/hu.po b/po/hu.po index b55a68a..8ab0e64 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-05 12:49+0200\n" @@ -4661,7 +4661,7 @@ msgstr "sor" #: libraries/display_export.lib.php:157 msgid "Dump some row(s)" -msgstr "" +msgstr "Néhány sor dumpolása" #: libraries/display_export.lib.php:159 #, fuzzy @@ -4675,7 +4675,7 @@ msgstr "Ettől a sortól kezdve:" #: libraries/display_export.lib.php:173 msgid "Dump all rows" -msgstr "" +msgstr "Összes sor dumpolása" #: libraries/display_export.lib.php:181 libraries/display_export.lib.php:202 msgid "Output:" diff --git a/po/id.po b/po/id.po index ed58c6f..0634f94 100644 --- a/po/id.po +++ b/po/id.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-16 22:04+0200\n" @@ -1488,7 +1488,7 @@ msgstr "Unik" #: libraries/Index.class.php:444 tbl_tracking.php:317 msgid "Packed" -msgstr "" +msgstr "Dipadatkan" #: libraries/Index.class.php:446 tbl_tracking.php:319 msgid "Cardinality" @@ -1776,7 +1776,7 @@ msgstr "Tidak bisa membuka arsip: %s" #: libraries/bookmark.lib.php:83 msgid "shared" -msgstr "" +msgstr "dibagi" #: libraries/build_html_for_db.lib.php:25 #: libraries/config/messages.inc.php:181 libraries/export/xml.php:36 @@ -2285,7 +2285,7 @@ msgstr "Reset" #: libraries/config/messages.inc.php:17 msgid "Improves efficiency of screen refresh" -msgstr "" +msgstr "Meningkatkan efisiensi refresh layar" #: libraries/config/messages.inc.php:18 msgid "Enable Ajax" @@ -2308,10 +2308,13 @@ msgid "" "inside a frame, and is a potential [strong]security hole[/strong] allowing " "cross-frame scripting attacks" msgstr "" +"Mengaktifkan ini memungkinkan halaman yang terletak pada domain yang berbeda " +"untuk memanggil phpMyAdmin di dalam frame, dan merupakan [strong]lubang " +"keamanan[/strong] potensial yang memungkinkan serangan scripting lintas-frame" #: libraries/config/messages.inc.php:22 msgid "Allow third party framing" -msgstr "" +msgstr "Ijinkan pembingkaian pihak ketiga" #: libraries/config/messages.inc.php:23 msgid "Show "Drop database" link to normal users" @@ -9291,8 +9294,10 @@ msgid "Width" msgstr "" #: tbl_chart.php:94 +#, fuzzy +#| msgid "Right" msgid "Height" -msgstr "" +msgstr "Kanan" #: tbl_chart.php:98 msgid "Title" @@ -9802,11 +9807,11 @@ msgstr "" #: tbl_tracking.php:503 msgid "This option will replace your table and contained data." -msgstr "" +msgstr "Pilihan ini akan mengganti table dan data isi table" #: tbl_tracking.php:503 msgid "SQL execution" -msgstr "" +msgstr "Menjalankan SQL" #: tbl_tracking.php:515 #, php-format @@ -9815,7 +9820,7 @@ msgstr "Ekspor sebagai %s" #: tbl_tracking.php:555 msgid "Show versions" -msgstr "" +msgstr "Tunjukkan Versi" #: tbl_tracking.php:587 msgid "Version" @@ -9867,7 +9872,7 @@ msgstr "" #: themes.php:41 msgid "Get more themes!" -msgstr "" +msgstr "Dapatkan tema lainnya" #: transformation_overview.php:24 msgid "Available MIME types" diff --git a/po/it.po b/po/it.po index 2af36a1..71f5d3c 100644 --- a/po/it.po +++ b/po/it.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-05 14:27+0200\n" diff --git a/po/ja.po b/po/ja.po index 11ac138..35e1d41 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-05 11:38+0200\n" diff --git a/po/ka.po b/po/ka.po index a7a99dd..d079bff 100644 --- a/po/ka.po +++ b/po/ka.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" diff --git a/po/ko.po b/po/ko.po index a430a0a..d04ac09 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-06-16 18:18+0200\n" diff --git a/po/lt.po b/po/lt.po index 1771e49..e3d12e9 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-05 15:52+0200\n" diff --git a/po/lv.po b/po/lv.po index 2c0b05a..edfab85 100644 --- a/po/lv.po +++ b/po/lv.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" diff --git a/po/mk.po b/po/mk.po index 388d6ca..4deb4b4 100644 --- a/po/mk.po +++ b/po/mk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" @@ -421,7 +421,7 @@ msgstr "Морате да изберете барем една колона за #: db_qbe.php:186 msgid "Switch to" -msgstr "" +msgstr "Префрли се во" #: db_qbe.php:186 msgid "visual builder" @@ -746,7 +746,7 @@ msgstr "База на податоци" #: db_tracking.php:86 msgid "Last version" -msgstr "" +msgstr "Последна Верзија" #: db_tracking.php:87 tbl_tracking.php:588 #, fuzzy @@ -755,7 +755,7 @@ msgstr "Креирај" #: db_tracking.php:88 tbl_tracking.php:589 msgid "Updated" -msgstr "" +msgstr "Ажурирано" #: db_tracking.php:89 libraries/common.lib.php:1354 #: libraries/server_links.inc.php:50 server_processlist.php:71 @@ -772,7 +772,7 @@ msgstr "Акција" #: db_tracking.php:101 js/messages.php:34 msgid "Delete tracking data for this table" -msgstr "" +msgstr "Избришете го податоците за тракирање од табелава" #: db_tracking.php:119 tbl_tracking.php:542 tbl_tracking.php:600 msgid "active" diff --git a/po/ml.po b/po/ml.po index 8193aeb..167850c 100644 --- a/po/ml.po +++ b/po/ml.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the phpMyAdmin package. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" diff --git a/po/mn.po b/po/mn.po index b7a3776..06cc511 100644 --- a/po/mn.po +++ b/po/mn.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" diff --git a/po/ms.po b/po/ms.po index 35218d8..1734f4b 100644 --- a/po/ms.po +++ b/po/ms.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" @@ -100,7 +100,7 @@ msgstr "" #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" -msgstr "" +msgstr "Gagal untuk membuka URL " #: changelog.php:32 license.php:28 #, php-format @@ -108,6 +108,8 @@ msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." msgstr "" +"Fail %s tidak ada di dalam sistem, sila ke laman sesawang www.phpmyadmin.net " +"untuk maklumat lanjut" #: db_create.php:58 #, fuzzy, php-format @@ -316,7 +318,7 @@ msgstr "" #: libraries/config/messages.inc.php:133 tbl_operations.php:552 #, php-format msgid "Add %s" -msgstr "" +msgstr "Tambah %s" #: db_operations.php:511 libraries/config/messages.inc.php:117 #: tbl_operations.php:310 tbl_operations.php:554 @@ -329,7 +331,7 @@ msgstr "" #: db_operations.php:528 msgid "Switch to copied database" -msgstr "" +msgstr "Tukar kepada pengkalan data yang di salin" #: db_operations.php:552 libraries/Index.class.php:447 #: libraries/build_html_for_db.lib.php:19 libraries/db_structure.lib.php:53 @@ -406,7 +408,7 @@ msgstr "" #: libraries/schema/Pdf_Relation_Schema.class.php:1228 tbl_printview.php:451 #: tbl_structure.php:919 msgid "Last check" -msgstr "" +msgstr "Semakan Terakhir" #: db_printview.php:220 db_structure.php:439 #, fuzzy, php-format diff --git a/po/nb.po b/po/nb.po index 0ad295e..1a7b7f9 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-07 11:21+0200\n" diff --git a/po/nl.po b/po/nl.po index ed47655..3f962a3 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-16 20:18+0200\n" diff --git a/po/pl.po b/po/pl.po index ac39790..9dd43c8 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-24 16:21+0200\n" diff --git a/po/pt.po b/po/pt.po index 15949fc..25967b3 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-26 03:23+0200\n" @@ -113,6 +113,8 @@ msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." msgstr "" +"O ficheiro %s não está disponível no seu sistema, por favor visite www." +"phpmyadmin.net para mais informações." #: db_create.php:58 #, php-format @@ -799,7 +801,7 @@ msgstr "Introduza cada valor num campo separado." #: enum_editor.php:57 msgid "+ Restart insertion and add a new value" -msgstr "" +msgstr "+ Reiniciar inserção e adicionar um novo valor" #: enum_editor.php:67 msgid "Output" @@ -807,7 +809,7 @@ msgstr "" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" -msgstr "" +msgstr "Copie e cole os valores juntos para o campo \"Comprimento/Valores\"" #: export.php:73 msgid "Selected export type has to be saved in file!" @@ -1127,7 +1129,7 @@ msgstr "Guarda" #: js/messages.php:91 libraries/display_tbl.lib.php:598 pmd_general.php:158 #: tbl_change.php:315 tbl_change.php:321 msgid "Hide" -msgstr "" +msgstr "Esconder" #: js/messages.php:94 #, fuzzy @@ -1154,7 +1156,7 @@ msgstr "Seleccione Foreign Key" #: js/messages.php:103 msgid "Please select the primary key or a unique key" -msgstr "" +msgstr "Por favor seleccione a chave primária ou a chave única " #: js/messages.php:104 pmd_general.php:87 tbl_relation.php:545 #, fuzzy diff --git a/po/pt_BR.po b/po/pt_BR.po index 6635ca2..bcf1e55 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-14 17:44+0200\n" @@ -1165,7 +1165,7 @@ msgstr "Escolha o campo para exibir" #: js/messages.php:107 msgid "Add an option for column " -msgstr "" +msgstr "Adicionar uma opção para a coluna" #: js/messages.php:110 #, fuzzy @@ -1193,6 +1193,8 @@ msgid "" "A newer version of phpMyAdmin is available and you should consider " "upgrading. The newest version is %s, released on %s." msgstr "" +"Uma nova versão do phpMyAdmin está disponível e você deve fazer a " +"atualização. A nova versão é %s, lançada em %s." #. l10n: Latest available phpMyAdmin version #: js/messages.php:120 @@ -1709,7 +1711,7 @@ msgstr "Documentação do phpMyAdmin " #: libraries/auth/cookie.auth.lib.php:244 #: libraries/auth/cookie.auth.lib.php:245 msgid "You can enter hostname/IP address and port separated by space." -msgstr "" +msgstr "Você pode digitar a url/IP e a porta separados por um espaço." #: libraries/auth/cookie.auth.lib.php:244 msgid "Server:" @@ -1758,7 +1760,7 @@ msgstr "Usuário ou senha incorreta. Acesso negado." #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format msgid "File %s does not contain any key id" -msgstr "" +msgstr "Arquivo %s não contém qualquer identificação da chave" #: libraries/auth/swekey/swekey.auth.lib.php:157 #: libraries/auth/swekey/swekey.auth.lib.php:180 @@ -1767,7 +1769,7 @@ msgstr "Falha na autenticação de hardware" #: libraries/auth/swekey/swekey.auth.lib.php:166 msgid "No valid authentication key plugged" -msgstr "" +msgstr "Nenhuma chave de autenticação válida foi conectada" #: libraries/auth/swekey/swekey.auth.lib.php:202 msgid "Authenticating..." @@ -1775,7 +1777,7 @@ msgstr "Autenticando..." #: libraries/blobstreaming.lib.php:241 msgid "PBMS error" -msgstr "" +msgstr "Erro PBMS" #: libraries/blobstreaming.lib.php:267 #, fuzzy @@ -1785,11 +1787,11 @@ msgstr "Collation de conexão do MySQL" #: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" -msgstr "" +msgstr "o PBMS falhou na obtenção de informações BLOB:" #: libraries/blobstreaming.lib.php:320 msgid "get BLOB Content-Type failed" -msgstr "" +msgstr "a obtenção do Tipo de conteúdo do BLOB falhou" #: libraries/blobstreaming.lib.php:347 msgid "View image" @@ -1810,7 +1812,7 @@ msgstr "Baixar arquivo" #: libraries/blobstreaming.lib.php:421 #, php-format msgid "Could not open file: %s" -msgstr "" +msgstr "Não foi possível abrir o arquivo: %s" #: libraries/bookmark.lib.php:83 msgid "shared" @@ -1853,7 +1855,7 @@ msgstr "Sem bases" #: libraries/build_html_for_db.lib.php:130 msgid "Not replicated" -msgstr "" +msgstr "Não aplicavel" #: libraries/build_html_for_db.lib.php:136 #, fuzzy @@ -1997,7 +1999,7 @@ msgstr "Mensagens do MySQL : " #: libraries/common.lib.php:1098 msgid "Failed to connect to SQL validator!" -msgstr "" +msgstr "Falha ao conectar ao validador SQL" #: libraries/common.lib.php:1139 libraries/config/messages.inc.php:463 msgid "Explain SQL" @@ -2030,7 +2032,7 @@ msgstr "Validar SQL" #: libraries/common.lib.php:1265 msgid "Inline edit of this query" -msgstr "" +msgstr "Na linha de edição da presente consulta" #: libraries/common.lib.php:1267 #, fuzzy @@ -2245,17 +2247,17 @@ msgstr "nenhuma das acima" #: libraries/config/FormDisplay.class.php:83 #: libraries/config/validate.lib.php:422 msgid "Not a positive number" -msgstr "" +msgstr "Número não positivo" #: libraries/config/FormDisplay.class.php:84 #: libraries/config/validate.lib.php:435 msgid "Not a non-negative number" -msgstr "" +msgstr "Não é um número negativo" #: libraries/config/FormDisplay.class.php:85 #: libraries/config/validate.lib.php:409 msgid "Not a valid port number" -msgstr "" +msgstr "Número de porta inválido" #: libraries/config/FormDisplay.class.php:86 #: libraries/config/FormDisplay.class.php:574 @@ -2272,7 +2274,7 @@ msgstr "O valor precisa ser igual ou menor que %s" #: libraries/config/FormDisplay.class.php:538 #, php-format msgid "Missing data for %s" -msgstr "" +msgstr "dado faltante para %s" #: libraries/config/FormDisplay.class.php:736 #: libraries/config/FormDisplay.class.php:740 @@ -2283,21 +2285,21 @@ msgstr "indisponível" #: libraries/config/FormDisplay.class.php:741 #, php-format msgid "\"%s\" requires %s extension" -msgstr "" +msgstr "\"%s\" requer a extenção %s " #: libraries/config/FormDisplay.class.php:755 #, php-format msgid "import will not work, missing function (%s)" -msgstr "" +msgstr "Importação não funcionou, função faltante (%s)" #: libraries/config/FormDisplay.class.php:759 #, php-format msgid "export will not work, missing function (%s)" -msgstr "" +msgstr "exportação não vai funcionar, faltando função (%s)" #: libraries/config/FormDisplay.class.php:766 msgid "SQL Validator is disabled" -msgstr "" +msgstr "Validador SQL desativado" #: libraries/config/FormDisplay.class.php:773 msgid "SOAP extension not found" @@ -2311,6 +2313,7 @@ msgstr "máximo %s" #: libraries/config/FormDisplay.tpl.php:173 msgid "This setting is disabled, it will not be applied to your configuration" msgstr "" +"Essa configuração está desativada, não será aplicado à sua configuração" #: libraries/config/FormDisplay.tpl.php:173 libraries/relation.lib.php:89 #: libraries/relation.lib.php:96 pmd_relation_new.php:68 @@ -2320,16 +2323,16 @@ msgstr "Desabilitado" #: libraries/config/FormDisplay.tpl.php:248 #, php-format msgid "Set value: %s" -msgstr "" +msgstr "Definir valor: %s" #: libraries/config/FormDisplay.tpl.php:253 #: libraries/config/messages.inc.php:351 msgid "Restore default value" -msgstr "" +msgstr "Restaurar valor padrão" #: libraries/config/FormDisplay.tpl.php:269 msgid "Allow users to customize this value" -msgstr "" +msgstr "Permitir a todos os usuários alterar esse valor" #: libraries/config/FormDisplay.tpl.php:333 #: libraries/schema/User_Schema.class.php:470 prefs_manage.php:320 @@ -2339,7 +2342,7 @@ msgstr "Restaurar" #: libraries/config/messages.inc.php:17 msgid "Improves efficiency of screen refresh" -msgstr "" +msgstr "Melhora a eficiência de atualização da tela" #: libraries/config/messages.inc.php:18 msgid "Enable Ajax" @@ -2349,6 +2352,8 @@ msgstr "Habilitar Ajax" msgid "" "If enabled user can enter any MySQL server in login form for cookie auth" msgstr "" +"Se o usuário habilitado pode entrar em qualquer servidor MySQL em formulário " +"de login por autenticação cookie" #: libraries/config/messages.inc.php:20 #, fuzzy @@ -2361,10 +2366,13 @@ msgid "" "inside a frame, and is a potential [strong]security hole[/strong] allowing " "cross-frame scripting attacks" msgstr "" +"Ativando essa opção permite uma página localizada em um domínio diferente " +"para chamar phpMyAdmin dentro de um quadro, e é um potencial [strong] falha " +"de segurança [/strong], que permite ataques de script cross-frame" #: libraries/config/messages.inc.php:22 msgid "Allow third party framing" -msgstr "" +msgstr "Permitir elaboração de terceiros" #: libraries/config/messages.inc.php:23 msgid "Show "Drop database" link to normal users" diff --git a/po/ro.po b/po/ro.po index dce5a04..2abf608 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:28+0200\n" diff --git a/po/ru.po b/po/ru.po index 94b8017..4cc2484 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-13 21:17+0200\n" diff --git a/po/si.po b/po/si.po index 5b15c7f..f20fbf1 100644 --- a/po/si.po +++ b/po/si.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-04 14:56+0200\n" diff --git a/po/sk.po b/po/sk.po index 9658b97..a82c16c 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:26+0200\n" diff --git a/po/sl.po b/po/sl.po index fec32cf..644813e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-24 22:38+0200\n" diff --git a/po/sq.po b/po/sq.po index 0b3c6dd..ef4f592 100644 --- a/po/sq.po +++ b/po/sq.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+l@lists.sourceforge.net\n"e"] falha "�абелава"�. Изходната БД ще "е ","''") + "'" + ' AND ';',', $values))); ?>">es=<?php echo urlencode(join(",", $values)); ?>">��NK�*P�m� �m��J�*6 ��!�!��m�@�m�x4,K�*P�m�"�J�*�J�*��m��J�*�m��/�K�*�J�* �K�*�$�K�*�)�K�*�J�*x4,K�*P�m� �m��J�*�!�!��m�@�m��K�*0�m�"�J�*�J�*��m��J�*�m��m��m��0J�*�p�@�m��J�*�J�*0�m��m��J�*GHIJKMNOP��m�@�m�H��J�*йm�"�J�*�J�*��m�0/�K�*�J�*@,K�*��J�* �K�*�$�K�*�)�K�*�J�*H��J�*йm��m��J�*8��J�*йm�@�m��J�*(��J�*йm�p�m��J�*��J�*йm��m��J�* �.�K�*�J�*�)�K�* �m��8�J�*�J�*�$�K�*@�m�y8�J�*�J�* �K�*p�m�Z8�J�*�J�*��J�*@,K�*��J�* �K�*�D,K�*�$�K�*�)�K�*�J�*�-�J�*�m��m��J�*#%')*-.035678:<=��m�@�m�pk�J�*�m�"�J�*8O,K�*�J�*�D,K�*�I,K�*�J�*cf�VJ�*@�m�pk�J�*�m��m��J�*�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv�B\J�*��m�FP�K�*FP�K�*?�YJ�*@�m��m�`�m��VJ�*�J�*�0J�*��m�BP�K�*��m��m��,1J�*@�m��BP�K�*H�m��J0200\n" "PO-Revision-Date: 2010-07-21 14:51+0200\n" diff --git a/po/sr.po b/po/sr.po index e4683dd..947f45e 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-06 18:43+0200\n" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index db8630f..2cc42cf 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-12-02 14:49+0200\n" diff --git a/po/sv.po b/po/sv.po index ca9e8a6..983612b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-16 21:42+0200\n" diff --git a/po/ta.po b/po/ta.po index e93f1de..d05bd8d 100644 --- a/po/ta.po +++ b/po/ta.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-04-16 10:43+0200\n" @@ -29,7 +29,7 @@ msgstr "" #: libraries/schema/Pdf_Relation_Schema.class.php:1114 #: libraries/schema/User_Schema.class.php:360 msgid "Page number:" -msgstr "" +msgstr "ஓலை என்" #: browse_foreigners.php:133 msgid "" @@ -43,7 +43,7 @@ msgstr "" #: libraries/common.lib.php:3015 libraries/db_links.inc.php:60 #: libraries/tbl_links.inc.php:61 msgid "Search" -msgstr "" +msgstr "தேடல்" #: browse_foreigners.php:154 db_operations.php:369 db_operations.php:421 #: db_operations.php:531 db_operations.php:559 db_search.php:358 diff --git a/po/te.po b/po/te.po index 3f9cc3f..27b3b43 100644 --- a/po/te.po +++ b/po/te.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-07 17:06+0200\n" diff --git a/po/th.po b/po/th.po index b5e2065..1078972 100644 --- a/po/th.po +++ b/po/th.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" diff --git a/po/tr.po b/po/tr.po index 999905a..a754a7b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-17 19:11+0200\n" diff --git a/po/tt.po b/po/tt.po index b8e9dd5..3f883ee 100644 --- a/po/tt.po +++ b/po/tt.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:25+0200\n" diff --git a/po/ug.po b/po/ug.po index 45c2b0e..8aae807 100644 --- a/po/ug.po +++ b/po/ug.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-08-26 11:59+0200\n" diff --git a/po/uk.po b/po/uk.po index f2b06fe..46256ef 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-12-28 22:26+0200\n" @@ -113,6 +113,8 @@ msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." msgstr "" +"файл %s недоступний на сервері, будь ласка завітайте на www.phpmyadmin.net " +"за додатковою інформацією." #: db_create.php:58 #, php-format @@ -417,7 +419,7 @@ msgstr "Переключитись на" #: db_qbe.php:186 msgid "visual builder" -msgstr "" +msgstr "Візуальний конструктор" #: db_qbe.php:222 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:858 @@ -596,7 +598,7 @@ msgstr "Таблицю %s було очищено" #: db_structure.php:286 tbl_operations.php:701 #, php-format msgid "View %s has been dropped" -msgstr "" +msgstr "Вигляд %s знищено" #: db_structure.php:286 tbl_operations.php:701 #, php-format diff --git a/po/ur.po b/po/ur.po index 949b622..54913e6 100644 --- a/po/ur.po +++ b/po/ur.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-23 08:37+0200\n" diff --git a/po/uz.po b/po/uz.po index 0d0869a..7381e7f 100644 --- a/po/uz.po +++ b/po/uz.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:31+0200\n" diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index 4deafde..0135f35 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:30+0200\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index eeeced8..979a8f5 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-04 09:47+0200\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 5001869..eaf18e4 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-31 09:47+0800\n" diff --git a/scripts/remove-incomplete-mo b/scripts/remove-incomplete-mo index d9e485c..ec7d3b3 100755 --- a/scripts/remove-incomplete-mo +++ b/scripts/remove-incomplete-mo @@ -8,7 +8,7 @@ set -e # # How many percent needs to be translated # -THRESHOLD=50 +THRESHOLD=40 # # Generated output file diff --git a/server_privileges.php b/server_privileges.php index 7e60f09..81de01f 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1698,7 +1698,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs unset ($row); echo ' <fieldset id="fieldset_add_user">' . "\n" - . ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&adduser=1">' . "\n" + . ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&adduser=1" class="' . $conditional_class . '">' . "\n" . PMA_getIcon('b_usradd.png') . ' ' . __('Add a new User') . '</a>' . "\n" . ' </fieldset>' . "\n"; diff --git a/server_replication.php b/server_replication.php index 9b7724d..a524591 100644 --- a/server_replication.php +++ b/server_replication.php @@ -53,7 +53,7 @@ if (isset($GLOBALS['sr_take_action'])) { if (! $link_to_master) { $_SESSION['replication']['sr_action_status'] = 'error'; - $_SESSION['replication']['sr_action_info'] = sprintf(__('Unable to connect to master %s.'), $sr['hostname']); + $_SESSION['replication']['sr_action_info'] = sprintf(__('Unable to connect to master %s.'), htmlspecialchars($sr['hostname'])); } else { // Read the current master position $position = PMA_replication_slave_bin_log_master($link_to_master); @@ -70,6 +70,7 @@ if (isset($GLOBALS['sr_take_action'])) { } else { $_SESSION['replication']['sr_action_status'] = 'success'; $_SESSION['replication']['sr_action_info'] = sprintf(__('Master server changed succesfully to %s'), $sr['hostname']); + $_SESSION['replication']['sr_action_info'] = sprintf(__('Master server changed succesfully to %s'), htmlspecialchars($sr['hostname'])); } } } diff --git a/server_synchronize.php b/server_synchronize.php index fa3a959..9ff9cd4 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -253,22 +253,18 @@ if ((isset($_REQUEST['submit_connect']))) { */ echo '<form name="synchronize_form" id="synchronize_form" method="post" action="server_synchronize.php">' . PMA_generate_common_hidden_inputs('', ''); - echo '<table id="serverstatustraffic" class="data" width = "60%"> + echo '<table id="serverstatustraffic" class="data" width = "40%"> <tr> - <td> <h2>' - . ($GLOBALS['cfg']['MainPageIconic'] - ? '<img class="icon" src="' . $pmaThemeImage . 'new_struct.jpg" width="32"' + <td>' + . '<img class="icon" src="' . $pmaThemeImage . 'new_struct.jpg" width="32"' . ' height="32" alt="" />' - : '') . __('Structure Synchronization') - .'</h2>' .'</td>'; - echo '<td> <h2>' - . ($GLOBALS['cfg']['MainPageIconic'] - ? '<img class="icon" src="' . $pmaThemeImage . 'new_data.jpg" width="32"' + .'</td>'; + echo '<td>' + . '<img class="icon" src="' . $pmaThemeImage . 'new_data.jpg" width="32"' . ' height="32" alt="" />' - : '') . __('Data Synchronization') - . '</h2>' .'</td>'; + . '</td>'; echo '</tr> </table>'; diff --git a/tbl_structure.php b/tbl_structure.php index ffdb0d2..7d380b4 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -252,7 +252,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { // for the case ENUM('–','“') $type = htmlspecialchars($type); if(strlen($type) > $GLOBALS['cfg']['LimitChars']) { - $type = '<abbr title="full text">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; + $type = '<abbr title="' . $type . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; } $type_nowrap = ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_4_3, created. RELEASE_3_4_3
by Marc Delisle 27 Jun '11

27 Jun '11

The annotated tag, RELEASE_3_4_3 has been created at f30ddf4cd87e63725a9b3c92d835e3474af25bd2 (tag) tagging 9fc6e35cfd1d8270d943f5577807a3c79f5c6168 (commit) replaces RELEASE_3_4_3RC1 tagged by Marc Delisle on Mon Jun 27 10:25:45 2011 -0400 - Log ----------------------------------------------------------------- Released 3.4.3 Marc Delisle (2): 3.4.3 release Merge branch 'MAINT_3_4_3' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into MAINT_3_4_3 Michal Čihař (7): Use standard infrastructure for generating links, this also prevents XSS I think htmlspecialchars should be used here Update translations from master Update translations from master Lower threshold for translations Really show full field definition, not just "full text" text Avoid double escaping ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_3, updated. RELEASE_3_4_3RC1-9-g9fc6e35
by Marc Delisle 27 Jun '11

27 Jun '11

The branch, MAINT_3_4_3 has been updated via 9fc6e35cfd1d8270d943f5577807a3c79f5c6168 (commit) from d3b67a35a0df4969273529501788c68b4fddcc24 (commit) - Log ----------------------------------------------------------------- commit 9fc6e35cfd1d8270d943f5577807a3c79f5c6168 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 16:09:22 2011 +0200 Avoid double escaping ----------------------------------------------------------------------- Summary of changes: tbl_structure.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbl_structure.php b/tbl_structure.php index 077dbcf..7d380b4 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -252,7 +252,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { // for the case ENUM('–','“') $type = htmlspecialchars($type); if(strlen($type) > $GLOBALS['cfg']['LimitChars']) { - $type = '<abbr title="' . htmlspecialchars($type) . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; + $type = '<abbr title="' . $type . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; } $type_nowrap = ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6308-g49a3978
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, master has been updated via 49a39787c3d44817c4c9056e0488d420a0e000ab (commit) via 9129444381fef0d9b57466219f21deae8fc95582 (commit) via 0c4148a68e38274e199fc9ab72d616b48b382529 (commit) via 31df8ebb5dd444fc40d566407d9b2a00eee8d1b9 (commit) via d3b67a35a0df4969273529501788c68b4fddcc24 (commit) via edf46c8022020099ac953b2e16f36f4f99687d87 (commit) via e21d6073e46d41afbf0a09ba9bd38cd19f37e968 (commit) from 12348ee826d45dd2ae7f1c5b055f71e888395f2a (commit) - Log ----------------------------------------------------------------- commit 49a39787c3d44817c4c9056e0488d420a0e000ab Merge: 0c4148a68e38274e199fc9ab72d616b48b382529 9129444381fef0d9b57466219f21deae8fc95582 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 16:10:48 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' commit 0c4148a68e38274e199fc9ab72d616b48b382529 Merge: 12348ee826d45dd2ae7f1c5b055f71e888395f2a 31df8ebb5dd444fc40d566407d9b2a00eee8d1b9 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 16:08:55 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: tbl_structure.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbl_structure.php b/tbl_structure.php index 4bb3a03..081b4b5 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -258,7 +258,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { // for the case ENUM('–','“') $type = htmlspecialchars($type); if(strlen($type) > $GLOBALS['cfg']['LimitChars']) { - $type = '<abbr title="' . htmlspecialchars($type) . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; + $type = '<abbr title="' . $type . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; } $type_nowrap = ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3RC1-20-g9129444
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, QA_3_4 has been updated via 9129444381fef0d9b57466219f21deae8fc95582 (commit) from 31df8ebb5dd444fc40d566407d9b2a00eee8d1b9 (commit) - Log ----------------------------------------------------------------- commit 9129444381fef0d9b57466219f21deae8fc95582 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 16:09:22 2011 +0200 Avoid double escaping ----------------------------------------------------------------------- Summary of changes: tbl_structure.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbl_structure.php b/tbl_structure.php index 077dbcf..7d380b4 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -252,7 +252,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { // for the case ENUM('–','“') $type = htmlspecialchars($type); if(strlen($type) > $GLOBALS['cfg']['LimitChars']) { - $type = '<abbr title="' . htmlspecialchars($type) . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; + $type = '<abbr title="' . $type . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; } $type_nowrap = ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3RC1-19-g31df8eb
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, QA_3_4 has been updated via 31df8ebb5dd444fc40d566407d9b2a00eee8d1b9 (commit) via d3b67a35a0df4969273529501788c68b4fddcc24 (commit) via e21d6073e46d41afbf0a09ba9bd38cd19f37e968 (commit) from edf46c8022020099ac953b2e16f36f4f99687d87 (commit) - Log ----------------------------------------------------------------- commit 31df8ebb5dd444fc40d566407d9b2a00eee8d1b9 Merge: edf46c8022020099ac953b2e16f36f4f99687d87 d3b67a35a0df4969273529501788c68b4fddcc24 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 16:08:11 2011 +0200 Merge branch 'MAINT_3_4_3' into QA_3_4 ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6301-g12348ee
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, master has been updated via 12348ee826d45dd2ae7f1c5b055f71e888395f2a (commit) via c9c9fdf49dfde051ce4b94ed8b9f6acc86e25a62 (commit) from 6a422caf527226740155c7e3682f2f3c61a85696 (commit) - Log ----------------------------------------------------------------- commit 12348ee826d45dd2ae7f1c5b055f71e888395f2a Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 14:50:16 2011 +0200 Fix escaping on LIKE queries All these need special variant of PMA_sqlAddSlashes. commit c9c9fdf49dfde051ce4b94ed8b9f6acc86e25a62 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 14:48:15 2011 +0200 Consistent capitalisation of PMA_sqlAddSlashes ----------------------------------------------------------------------- Summary of changes: db_operations.php | 4 +- db_printview.php | 2 +- db_routines.php | 6 +- db_search.php | 6 +- db_tracking.php | 4 +- import.php | 2 +- libraries/List_Database.class.php | 4 +- libraries/RecentTable.class.php | 2 +- libraries/Table.class.php | 136 ++++++++++---------- libraries/Tracker.class.php | 76 ++++++------ libraries/blobstreaming.lib.php | 8 +- libraries/bookmark.lib.php | 14 +- libraries/common.lib.php | 12 +- libraries/database_interface.lib.php | 16 ++-- libraries/db_events.inc.php | 2 +- libraries/db_info.inc.php | 2 +- libraries/db_routines.lib.php | 6 +- libraries/db_table_exists.lib.php | 2 +- libraries/display_tbl.lib.php | 2 +- libraries/export/sql.php | 8 +- libraries/import.lib.php | 2 +- libraries/import/docsql.php | 20 ++-- libraries/import/ldi.php | 6 +- libraries/relation.lib.php | 64 +++++----- libraries/relation_cleanup.lib.php | 64 +++++----- libraries/schema/Dia_Relation_Schema.class.php | 4 +- libraries/schema/Eps_Relation_Schema.class.php | 4 +- libraries/schema/Export_Relation_Schema.class.php | 4 +- libraries/schema/Pdf_Relation_Schema.class.php | 6 +- libraries/schema/Svg_Relation_Schema.class.php | 4 +- libraries/schema/User_Schema.class.php | 42 +++--- libraries/schema/Visio_Relation_Schema.class.php | 4 +- libraries/server_synchronize.lib.php | 6 +- libraries/tbl_replace_fields.inc.php | 6 +- libraries/transformations.lib.php | 34 +++--- libraries/user_preferences.lib.php | 12 +- pmd_display_field.php | 16 ++-- pmd_pdf.php | 10 +- pmd_relation_new.php | 12 +- pmd_relation_upd.php | 12 +- pmd_save_pos.php | 16 ++-- server_privileges.php | 102 ++++++++-------- server_replication.php | 8 +- sql.php | 2 +- tbl_alter.php | 2 +- tbl_create.php | 6 +- tbl_operations.php | 6 +- tbl_relation.php | 46 ++++---- tbl_replace.php | 4 +- tbl_select.php | 8 +- tbl_tracking.php | 6 +- test/PMA_quoting_slashing_test.php | 16 ++-- user_password.php | 2 +- 53 files changed, 435 insertions(+), 435 deletions(-) diff --git a/db_operations.php b/db_operations.php index dd6255c..190f9b6 100644 --- a/db_operations.php +++ b/db_operations.php @@ -232,7 +232,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { // to avoid selecting alternatively the current and new db // we would need to modify the CREATE definitions to qualify // the db name - $event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';'); + $event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddSlashes($db,true) . '\';'); if ($event_names) { foreach($event_names as $event_name) { PMA_DBI_select_db($db); @@ -586,7 +586,7 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { ?> $test_query = ' SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) . ' - WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''; + WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''; $test_rs = PMA_query_as_controluser($test_query, null, PMA_DBI_QUERY_STORE); /* diff --git a/db_printview.php b/db_printview.php index 3b02b86..e253411 100644 --- a/db_printview.php +++ b/db_printview.php @@ -53,7 +53,7 @@ if ($cfg['SkipLockedTables'] == true) { if ($result != false && PMA_DBI_num_rows($result) > 0) { while ($tmp = PMA_DBI_fetch_row($result)) { if (! isset($sot_cache[$tmp[0]])) { - $sts_result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddSlashes($tmp[0]) . '\';'); + $sts_result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddSlashes($tmp[0], true) . '\';'); $sts_tmp = PMA_DBI_fetch_assoc($sts_result); $tables[] = $sts_tmp; } else { // table in use diff --git a/db_routines.php b/db_routines.php index 4b0b23f..b9417fd 100644 --- a/db_routines.php +++ b/db_routines.php @@ -253,8 +253,8 @@ if (! empty($_REQUEST['execute_routine']) && ! empty($_REQUEST['routine_name'])) $routine_name = htmlspecialchars(PMA_backquote($_GET['routine_name'])); $routine_type = PMA_DBI_fetch_value("SELECT ROUTINE_TYPE " . "FROM INFORMATION_SCHEMA.ROUTINES " - . "WHERE ROUTINE_SCHEMA='" . PMA_sqlAddslashes($db) . "' " - . "AND SPECIFIC_NAME='" . PMA_sqlAddslashes($_GET['routine_name']) . "';"); + . "WHERE ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "' " + . "AND SPECIFIC_NAME='" . PMA_sqlAddSlashes($_GET['routine_name']) . "';"); if (! empty($routine_type) && $create_proc = PMA_DBI_get_definition($db, $routine_type, $_GET['routine_name'])) { $create_proc = '<textarea cols="40" rows="15" style="width: 100%;">' . htmlspecialchars($create_proc) . '</textarea>'; if ($GLOBALS['is_ajax_request']) { @@ -347,7 +347,7 @@ if (! empty($_REQUEST['execute_routine']) && ! empty($_REQUEST['routine_name'])) $extra_data = array(); if ($message->isSuccess()) { $columns = "`SPECIFIC_NAME`, `ROUTINE_NAME`, `ROUTINE_TYPE`, `DTD_IDENTIFIER`, `ROUTINE_DEFINITION`"; - $where = "ROUTINE_SCHEMA='" . PMA_sqlAddslashes($db) . "' AND ROUTINE_NAME='" . PMA_sqlAddslashes($_REQUEST['routine_name']) . "'"; + $where = "ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "' AND ROUTINE_NAME='" . PMA_sqlAddSlashes($_REQUEST['routine_name']) . "'"; $routine = PMA_DBI_fetch_single_row("SELECT $columns FROM `INFORMATION_SCHEMA`.`ROUTINES` WHERE $where;"); $extra_data['name'] = htmlspecialchars(strtoupper($_REQUEST['routine_name'])); $extra_data['new_row'] = PMA_RTN_getRowForRoutinesList($routine, 0, true); diff --git a/db_search.php b/db_search.php index ea50569..69350cd 100644 --- a/db_search.php +++ b/db_search.php @@ -61,11 +61,11 @@ if (empty($_REQUEST['search_str']) || ! is_string($_REQUEST['search_str'])) { $searched = htmlspecialchars($_REQUEST['search_str']); // For "as regular expression" (search option 4), we should not treat // this as an expression that contains a LIKE (second parameter of - // PMA_sqlAddslashes()). + // PMA_sqlAddSlashes()). // // Usage example: If user is seaching for a literal $ in a regexp search, // he should enter \$ as the value. - $search_str = PMA_sqlAddslashes($_REQUEST['search_str'], ($search_option == 4 ? false : true)); + $search_str = PMA_sqlAddSlashes($_REQUEST['search_str'], ($search_option == 4 ? false : true)); } $tables_selected = array(); @@ -84,7 +84,7 @@ if (isset($_REQUEST['selectall'])) { if (empty($_REQUEST['field_str']) || ! is_string($_REQUEST['field_str'])) { unset($field_str); } else { - $field_str = PMA_sqlAddslashes($_REQUEST['field_str'], true); + $field_str = PMA_sqlAddSlashes($_REQUEST['field_str'], true); } /** diff --git a/db_tracking.php b/db_tracking.php index c0421d6..3a9b695 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -67,7 +67,7 @@ require_once './libraries/db_links.inc.php'; $all_tables_query = ' SELECT table_name, MAX(version) as version FROM ' . PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . '.' . PMA_backquote($GLOBALS['cfg']['Server']['tracking']) . - ' WHERE ' . PMA_backquote('db_name') . ' = \'' . PMA_sqlAddslashes($_REQUEST['db']) . '\' ' . + ' WHERE ' . PMA_backquote('db_name') . ' = \'' . PMA_sqlAddSlashes($_REQUEST['db']) . '\' ' . ' GROUP BY '. PMA_backquote('table_name') . ' ORDER BY '. PMA_backquote('table_name') .' ASC'; @@ -110,7 +110,7 @@ if (PMA_DBI_num_rows($all_tables_result) > 0) { $table_query = ' SELECT * FROM ' . PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . '.' . PMA_backquote($GLOBALS['cfg']['Server']['tracking']) . - ' WHERE `db_name` = \'' . PMA_sqlAddslashes($_REQUEST['db']) . '\' AND `table_name` = \'' . PMA_sqlAddslashes($table_name) . '\' AND `version` = \'' . $version_number . '\''; + ' WHERE `db_name` = \'' . PMA_sqlAddSlashes($_REQUEST['db']) . '\' AND `table_name` = \'' . PMA_sqlAddSlashes($table_name) . '\' AND `version` = \'' . $version_number . '\''; $table_result = PMA_query_as_controluser($table_query); $version_data = PMA_DBI_fetch_array($table_result); diff --git a/import.php b/import.php index 6506dc8..afc513c 100644 --- a/import.php +++ b/import.php @@ -153,7 +153,7 @@ if (!empty($id_bookmark)) { case 0: // bookmarked query that have to be run $import_text = PMA_Bookmark_get($db, $id_bookmark, 'id', isset($action_bookmark_all)); if (isset($bookmark_variable) && !empty($bookmark_variable)) { - $import_text = preg_replace('|/\*(.*)\[VARIABLE\](.*)\*/|imsU', '${1}' . PMA_sqlAddslashes($bookmark_variable) . '${2}', $import_text); + $import_text = preg_replace('|/\*(.*)\[VARIABLE\](.*)\*/|imsU', '${1}' . PMA_sqlAddSlashes($bookmark_variable) . '${2}', $import_text); } // refresh left frame on changes in table or db structure diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index 2349852..bf1d468 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -423,7 +423,7 @@ require_once './libraries/List.class.php'; SELECT DISTINCT `Db` FROM `mysql`.`db` WHERE `Select_priv` = 'Y' AND `User` - IN ('" . PMA_sqlAddslashes($GLOBALS['cfg']['Server']['user']) . "', '')"; + IN ('" . PMA_sqlAddSlashes($GLOBALS['cfg']['Server']['user']) . "', '')"; $tmp_mydbs = PMA_DBI_fetch_result($local_query, null, null, $GLOBALS['controllink']); if ($tmp_mydbs) { @@ -471,7 +471,7 @@ require_once './libraries/List.class.php'; } // end if // 2. get allowed dbs from the "mysql.tables_priv" table - $local_query = 'SELECT DISTINCT Db FROM mysql.tables_priv WHERE Table_priv LIKE \'%Select%\' AND User = \'' . PMA_sqlAddslashes($GLOBALS['cfg']['Server']['user']) . '\''; + $local_query = 'SELECT DISTINCT Db FROM mysql.tables_priv WHERE Table_priv LIKE \'%Select%\' AND User = \'' . PMA_sqlAddSlashes($GLOBALS['cfg']['Server']['user']) . '\''; $rs = PMA_DBI_try_query($local_query, $GLOBALS['controllink']); if ($rs && @PMA_DBI_num_rows($rs)) { while ($row = PMA_DBI_fetch_assoc($rs)) { diff --git a/libraries/RecentTable.class.php b/libraries/RecentTable.class.php index 5a53a41..f844bbc 100644 --- a/libraries/RecentTable.class.php +++ b/libraries/RecentTable.class.php @@ -99,7 +99,7 @@ class PMA_RecentTable $username = $GLOBALS['cfg']['Server']['user']; $sql_query = " REPLACE INTO " . $this->pma_table . " (`username`, `tables`)" . - " VALUES ('" . $username . "', '" . PMA_sqlAddslashes(json_encode($this->tables)) . "')"; + " VALUES ('" . $username . "', '" . PMA_sqlAddSlashes(json_encode($this->tables)) . "')"; $success = PMA_DBI_try_query($sql_query, $GLOBALS['controllink']); diff --git a/libraries/Table.class.php b/libraries/Table.class.php index baa677f..0acd2d9 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -378,7 +378,7 @@ class PMA_Table } elseif ($type == 'BIT') { $query .= ' DEFAULT b\'' . preg_replace('/[^01]/', '0', $default_value) . '\''; } else { - $query .= ' DEFAULT \'' . PMA_sqlAddslashes($default_value) . '\''; + $query .= ' DEFAULT \'' . PMA_sqlAddSlashes($default_value) . '\''; } break; case 'NULL' : @@ -421,7 +421,7 @@ class PMA_Table } // end if (auto_increment) } if (!empty($comment)) { - $query .= " COMMENT '" . PMA_sqlAddslashes($comment) . "'"; + $query .= " COMMENT '" . PMA_sqlAddSlashes($comment) . "'"; } return $query; } // end function @@ -549,14 +549,14 @@ class PMA_Table $where_parts = array(); foreach ($where_fields as $_where => $_value) { $where_parts[] = PMA_backquote($_where) . ' = \'' - . PMA_sqlAddslashes($_value) . '\''; + . PMA_sqlAddSlashes($_value) . '\''; } $new_parts = array(); $new_value_parts = array(); foreach ($new_fields as $_where => $_value) { $new_parts[] = PMA_backquote($_where); - $new_value_parts[] = PMA_sqlAddslashes($_value); + $new_value_parts[] = PMA_sqlAddSlashes($_value); } $table_copy_query = ' @@ -574,7 +574,7 @@ class PMA_Table $value_parts = array(); foreach ($table_copy_row as $_key => $_val) { if (isset($row_fields[$_key]) && $row_fields[$_key] == 'cc') { - $value_parts[] = PMA_sqlAddslashes($_val); + $value_parts[] = PMA_sqlAddSlashes($_val); } } @@ -805,10 +805,10 @@ class PMA_Table // Move old entries from PMA-DBs to new table if ($GLOBALS['cfgRelation']['commwork']) { $remove_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['column_info']) - . ' SET table_name = \'' . PMA_sqlAddslashes($target_table) . '\', ' - . ' db_name = \'' . PMA_sqlAddslashes($target_db) . '\'' - . ' WHERE db_name = \'' . PMA_sqlAddslashes($source_db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($source_table) . '\''; + . ' SET table_name = \'' . PMA_sqlAddSlashes($target_table) . '\', ' + . ' db_name = \'' . PMA_sqlAddSlashes($target_db) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($source_db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($source_table) . '\''; PMA_query_as_controluser($remove_query); unset($remove_query); } @@ -818,28 +818,28 @@ class PMA_Table if ($GLOBALS['cfgRelation']['displaywork']) { $table_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['table_info']) - . ' SET db_name = \'' . PMA_sqlAddslashes($target_db) . '\', ' - . ' table_name = \'' . PMA_sqlAddslashes($target_table) . '\'' - . ' WHERE db_name = \'' . PMA_sqlAddslashes($source_db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($source_table) . '\''; + . ' SET db_name = \'' . PMA_sqlAddSlashes($target_db) . '\', ' + . ' table_name = \'' . PMA_sqlAddSlashes($target_table) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($source_db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($source_table) . '\''; PMA_query_as_controluser($table_query); unset($table_query); } if ($GLOBALS['cfgRelation']['relwork']) { $table_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['relation']) - . ' SET foreign_table = \'' . PMA_sqlAddslashes($target_table) . '\',' - . ' foreign_db = \'' . PMA_sqlAddslashes($target_db) . '\'' - . ' WHERE foreign_db = \'' . PMA_sqlAddslashes($source_db) . '\'' - . ' AND foreign_table = \'' . PMA_sqlAddslashes($source_table) . '\''; + . ' SET foreign_table = \'' . PMA_sqlAddSlashes($target_table) . '\',' + . ' foreign_db = \'' . PMA_sqlAddSlashes($target_db) . '\'' + . ' WHERE foreign_db = \'' . PMA_sqlAddSlashes($source_db) . '\'' + . ' AND foreign_table = \'' . PMA_sqlAddSlashes($source_table) . '\''; PMA_query_as_controluser($table_query); unset($table_query); $table_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['relation']) - . ' SET master_table = \'' . PMA_sqlAddslashes($target_table) . '\',' - . ' master_db = \'' . PMA_sqlAddslashes($target_db) . '\'' - . ' WHERE master_db = \'' . PMA_sqlAddslashes($source_db) . '\'' - . ' AND master_table = \'' . PMA_sqlAddslashes($source_table) . '\''; + . ' SET master_table = \'' . PMA_sqlAddSlashes($target_table) . '\',' + . ' master_db = \'' . PMA_sqlAddSlashes($target_db) . '\'' + . ' WHERE master_db = \'' . PMA_sqlAddSlashes($source_db) . '\'' + . ' AND master_table = \'' . PMA_sqlAddSlashes($source_table) . '\''; PMA_query_as_controluser($table_query); unset($table_query); } @@ -853,24 +853,24 @@ class PMA_Table if ($GLOBALS['cfgRelation']['pdfwork']) { $table_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['table_coords']) - . ' SET table_name = \'' . PMA_sqlAddslashes($target_table) . '\',' - . ' db_name = \'' . PMA_sqlAddslashes($target_db) . '\'' - . ' WHERE db_name = \'' . PMA_sqlAddslashes($source_db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($source_table) . '\''; + . ' SET table_name = \'' . PMA_sqlAddSlashes($target_table) . '\',' + . ' db_name = \'' . PMA_sqlAddSlashes($target_db) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($source_db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($source_table) . '\''; PMA_query_as_controluser($table_query); unset($table_query); /* $pdf_query = 'SELECT pdf_page_number ' . ' FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['table_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($target_db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($target_table) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($target_db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($target_table) . '\''; $pdf_rs = PMA_query_as_controluser($pdf_query); while ($pdf_copy_row = PMA_DBI_fetch_assoc($pdf_rs)) { $table_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['pdf_pages']) - . ' SET db_name = \'' . PMA_sqlAddslashes($target_db) . '\'' - . ' WHERE db_name = \'' . PMA_sqlAddslashes($source_db) . '\'' - . ' AND page_nr = \'' . PMA_sqlAddslashes($pdf_copy_row['pdf_page_number']) . '\''; + . ' SET db_name = \'' . PMA_sqlAddSlashes($target_db) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($source_db) . '\'' + . ' AND page_nr = \'' . PMA_sqlAddSlashes($pdf_copy_row['pdf_page_number']) . '\''; $tb_rs = PMA_query_as_controluser($table_query); unset($table_query); unset($tb_rs); @@ -880,10 +880,10 @@ class PMA_Table if ($GLOBALS['cfgRelation']['designerwork']) { $table_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['designer_coords']) - . ' SET table_name = \'' . PMA_sqlAddslashes($target_table) . '\',' - . ' db_name = \'' . PMA_sqlAddslashes($target_db) . '\'' - . ' WHERE db_name = \'' . PMA_sqlAddslashes($source_db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($source_table) . '\''; + . ' SET table_name = \'' . PMA_sqlAddSlashes($target_table) . '\',' + . ' db_name = \'' . PMA_sqlAddSlashes($target_db) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($source_db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($source_table) . '\''; PMA_query_as_controluser($table_query); unset($table_query); } @@ -900,8 +900,8 @@ class PMA_Table column_name, ' . PMA_backquote('comment') . ($GLOBALS['cfgRelation']['mimework'] ? ', mimetype, transformation, transformation_options' : '') . ' FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['column_info']) . ' WHERE - db_name = \'' . PMA_sqlAddslashes($source_db) . '\' AND - table_name = \'' . PMA_sqlAddslashes($source_table) . '\''; + db_name = \'' . PMA_sqlAddSlashes($source_db) . '\' AND + table_name = \'' . PMA_sqlAddSlashes($source_table) . '\''; $comments_copy_rs = PMA_query_as_controluser($comments_copy_query); // Write every comment as new copied entry. [MIME] @@ -909,13 +909,13 @@ class PMA_Table $new_comment_query = 'REPLACE INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['column_info']) . ' (db_name, table_name, column_name, ' . PMA_backquote('comment') . ($GLOBALS['cfgRelation']['mimework'] ? ', mimetype, transformation, transformation_options' : '') . ') ' . ' VALUES(' - . '\'' . PMA_sqlAddslashes($target_db) . '\',' - . '\'' . PMA_sqlAddslashes($target_table) . '\',' - . '\'' . PMA_sqlAddslashes($comments_copy_row['column_name']) . '\'' - . ($GLOBALS['cfgRelation']['mimework'] ? ',\'' . PMA_sqlAddslashes($comments_copy_row['comment']) . '\',' - . '\'' . PMA_sqlAddslashes($comments_copy_row['mimetype']) . '\',' - . '\'' . PMA_sqlAddslashes($comments_copy_row['transformation']) . '\',' - . '\'' . PMA_sqlAddslashes($comments_copy_row['transformation_options']) . '\'' : '') + . '\'' . PMA_sqlAddSlashes($target_db) . '\',' + . '\'' . PMA_sqlAddSlashes($target_table) . '\',' + . '\'' . PMA_sqlAddSlashes($comments_copy_row['column_name']) . '\'' + . ($GLOBALS['cfgRelation']['mimework'] ? ',\'' . PMA_sqlAddSlashes($comments_copy_row['comment']) . '\',' + . '\'' . PMA_sqlAddSlashes($comments_copy_row['mimetype']) . '\',' + . '\'' . PMA_sqlAddSlashes($comments_copy_row['transformation']) . '\',' + . '\'' . PMA_sqlAddSlashes($comments_copy_row['transformation_options']) . '\'' : '') . ')'; PMA_query_as_controluser($new_comment_query); } // end while @@ -1065,10 +1065,10 @@ class PMA_Table $remove_query = ' UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['column_info']) . ' - SET `db_name` = \'' . PMA_sqlAddslashes($new_db) . '\', - `table_name` = \'' . PMA_sqlAddslashes($new_name) . '\' - WHERE `db_name` = \'' . PMA_sqlAddslashes($old_db) . '\' - AND `table_name` = \'' . PMA_sqlAddslashes($old_name) . '\''; + SET `db_name` = \'' . PMA_sqlAddSlashes($new_db) . '\', + `table_name` = \'' . PMA_sqlAddSlashes($new_name) . '\' + WHERE `db_name` = \'' . PMA_sqlAddSlashes($old_db) . '\' + AND `table_name` = \'' . PMA_sqlAddSlashes($old_name) . '\''; PMA_query_as_controluser($remove_query); unset($remove_query); } @@ -1077,10 +1077,10 @@ class PMA_Table $table_query = ' UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['table_info']) . ' - SET `db_name` = \'' . PMA_sqlAddslashes($new_db) . '\', - `table_name` = \'' . PMA_sqlAddslashes($new_name) . '\' - WHERE `db_name` = \'' . PMA_sqlAddslashes($old_db) . '\' - AND `table_name` = \'' . PMA_sqlAddslashes($old_name) . '\''; + SET `db_name` = \'' . PMA_sqlAddSlashes($new_db) . '\', + `table_name` = \'' . PMA_sqlAddSlashes($new_name) . '\' + WHERE `db_name` = \'' . PMA_sqlAddSlashes($old_db) . '\' + AND `table_name` = \'' . PMA_sqlAddSlashes($old_name) . '\''; PMA_query_as_controluser($table_query); unset($table_query); } @@ -1089,19 +1089,19 @@ class PMA_Table $table_query = ' UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['relation']) . ' - SET `foreign_db` = \'' . PMA_sqlAddslashes($new_db) . '\', - `foreign_table` = \'' . PMA_sqlAddslashes($new_name) . '\' - WHERE `foreign_db` = \'' . PMA_sqlAddslashes($old_db) . '\' - AND `foreign_table` = \'' . PMA_sqlAddslashes($old_name) . '\''; + SET `foreign_db` = \'' . PMA_sqlAddSlashes($new_db) . '\', + `foreign_table` = \'' . PMA_sqlAddSlashes($new_name) . '\' + WHERE `foreign_db` = \'' . PMA_sqlAddSlashes($old_db) . '\' + AND `foreign_table` = \'' . PMA_sqlAddSlashes($old_name) . '\''; PMA_query_as_controluser($table_query); $table_query = ' UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['relation']) . ' - SET `master_db` = \'' . PMA_sqlAddslashes($new_db) . '\', - `master_table` = \'' . PMA_sqlAddslashes($new_name) . '\' - WHERE `master_db` = \'' . PMA_sqlAddslashes($old_db) . '\' - AND `master_table` = \'' . PMA_sqlAddslashes($old_name) . '\''; + SET `master_db` = \'' . PMA_sqlAddSlashes($new_db) . '\', + `master_table` = \'' . PMA_sqlAddSlashes($new_name) . '\' + WHERE `master_db` = \'' . PMA_sqlAddSlashes($old_db) . '\' + AND `master_table` = \'' . PMA_sqlAddSlashes($old_name) . '\''; PMA_query_as_controluser($table_query); unset($table_query); } @@ -1110,10 +1110,10 @@ class PMA_Table $table_query = ' UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['table_coords']) . ' - SET `db_name` = \'' . PMA_sqlAddslashes($new_db) . '\', - `table_name` = \'' . PMA_sqlAddslashes($new_name) . '\' - WHERE `db_name` = \'' . PMA_sqlAddslashes($old_db) . '\' - AND `table_name` = \'' . PMA_sqlAddslashes($old_name) . '\''; + SET `db_name` = \'' . PMA_sqlAddSlashes($new_db) . '\', + `table_name` = \'' . PMA_sqlAddSlashes($new_name) . '\' + WHERE `db_name` = \'' . PMA_sqlAddSlashes($old_db) . '\' + AND `table_name` = \'' . PMA_sqlAddSlashes($old_name) . '\''; PMA_query_as_controluser($table_query); unset($table_query); } @@ -1122,10 +1122,10 @@ class PMA_Table $table_query = ' UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['designer_coords']) . ' - SET `db_name` = \'' . PMA_sqlAddslashes($new_db) . '\', - `table_name` = \'' . PMA_sqlAddslashes($new_name) . '\' - WHERE `db_name` = \'' . PMA_sqlAddslashes($old_db) . '\' - AND `table_name` = \'' . PMA_sqlAddslashes($old_name) . '\''; + SET `db_name` = \'' . PMA_sqlAddSlashes($new_db) . '\', + `table_name` = \'' . PMA_sqlAddSlashes($new_name) . '\' + WHERE `db_name` = \'' . PMA_sqlAddSlashes($old_db) . '\' + AND `table_name` = \'' . PMA_sqlAddSlashes($old_name) . '\''; PMA_query_as_controluser($table_query); unset($table_query); } @@ -1252,7 +1252,7 @@ class PMA_Table $sql_query = " REPLACE INTO " . $pma_table . " VALUES ('" . $username . "', '" . $this->db_name . "', '" . - $this->name . "', '" . PMA_sqlAddslashes(json_encode($this->uiprefs)) . "')"; + $this->name . "', '" . PMA_sqlAddSlashes(json_encode($this->uiprefs)) . "')"; $success = PMA_DBI_try_query($sql_query, $GLOBALS['controllink']); diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index 35ab7f4..da9a56a 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -219,8 +219,8 @@ class PMA_Tracker $sql_query = " SELECT tracking_active FROM " . self::$pma_table . - " WHERE " . PMA_backquote('db_name') . " = '" . PMA_sqlAddslashes($dbname) . "' " . - " AND " . PMA_backquote('table_name') . " = '" . PMA_sqlAddslashes($tablename) . "' " . + " WHERE " . PMA_backquote('db_name') . " = '" . PMA_sqlAddSlashes($dbname) . "' " . + " AND " . PMA_backquote('table_name') . " = '" . PMA_sqlAddSlashes($tablename) . "' " . " ORDER BY version DESC"; $row = PMA_DBI_fetch_array(PMA_query_as_controluser($sql_query)); @@ -331,15 +331,15 @@ class PMA_Tracker "tracking " . ") " . "values ( - '" . PMA_sqlAddslashes($dbname) . "', - '" . PMA_sqlAddslashes($tablename) . "', - '" . PMA_sqlAddslashes($version) . "', - '" . PMA_sqlAddslashes($date) . "', - '" . PMA_sqlAddslashes($date) . "', - '" . PMA_sqlAddslashes($snapshot) . "', - '" . PMA_sqlAddslashes($create_sql) . "', - '" . PMA_sqlAddslashes("\n") . "', - '" . PMA_sqlAddslashes($tracking_set) . "' )"; + '" . PMA_sqlAddSlashes($dbname) . "', + '" . PMA_sqlAddSlashes($tablename) . "', + '" . PMA_sqlAddSlashes($version) . "', + '" . PMA_sqlAddSlashes($date) . "', + '" . PMA_sqlAddSlashes($date) . "', + '" . PMA_sqlAddSlashes($snapshot) . "', + '" . PMA_sqlAddSlashes($create_sql) . "', + '" . PMA_sqlAddSlashes("\n") . "', + '" . PMA_sqlAddSlashes($tracking_set) . "' )"; $result = PMA_query_as_controluser($sql_query); @@ -366,7 +366,7 @@ class PMA_Tracker { $sql_query = "/*NOTRACK*/\n" . - "DELETE FROM " . self::$pma_table . " WHERE `db_name` = '" . PMA_sqlAddslashes($dbname) . "' AND `table_name` = '" . PMA_sqlAddslashes($tablename) . "'"; + "DELETE FROM " . self::$pma_table . " WHERE `db_name` = '" . PMA_sqlAddSlashes($dbname) . "' AND `table_name` = '" . PMA_sqlAddSlashes($tablename) . "'"; $result = PMA_query_as_controluser($sql_query); return $result; @@ -421,15 +421,15 @@ class PMA_Tracker "tracking " . ") " . "values ( - '" . PMA_sqlAddslashes($dbname) . "', - '" . PMA_sqlAddslashes('') . "', - '" . PMA_sqlAddslashes($version) . "', - '" . PMA_sqlAddslashes($date) . "', - '" . PMA_sqlAddslashes($date) . "', - '" . PMA_sqlAddslashes('') . "', - '" . PMA_sqlAddslashes($create_sql) . "', - '" . PMA_sqlAddslashes("\n") . "', - '" . PMA_sqlAddslashes($tracking_set) . "' )"; + '" . PMA_sqlAddSlashes($dbname) . "', + '" . PMA_sqlAddSlashes('') . "', + '" . PMA_sqlAddSlashes($version) . "', + '" . PMA_sqlAddSlashes($date) . "', + '" . PMA_sqlAddSlashes($date) . "', + '" . PMA_sqlAddSlashes('') . "', + '" . PMA_sqlAddSlashes($create_sql) . "', + '" . PMA_sqlAddSlashes("\n") . "', + '" . PMA_sqlAddSlashes($tracking_set) . "' )"; $result = PMA_query_as_controluser($sql_query); @@ -455,9 +455,9 @@ class PMA_Tracker $sql_query = " UPDATE " . self::$pma_table . " SET `tracking_active` = '" . $new_state . "' " . - " WHERE `db_name` = '" . PMA_sqlAddslashes($dbname) . "' " . - " AND `table_name` = '" . PMA_sqlAddslashes($tablename) . "' " . - " AND `version` = '" . PMA_sqlAddslashes($version) . "' "; + " WHERE `db_name` = '" . PMA_sqlAddSlashes($dbname) . "' " . + " AND `table_name` = '" . PMA_sqlAddSlashes($tablename) . "' " . + " AND `version` = '" . PMA_sqlAddSlashes($version) . "' "; $result = PMA_query_as_controluser($sql_query); @@ -491,7 +491,7 @@ class PMA_Tracker $new_data_processed = ''; if (is_array($new_data)) { foreach ($new_data as $data) { - $new_data_processed .= '# log ' . $date . ' ' . $data['username'] . PMA_sqlAddslashes($data['statement']) . "\n"; + $new_data_processed .= '# log ' . $date . ' ' . $data['username'] . PMA_sqlAddSlashes($data['statement']) . "\n"; } } else { $new_data_processed = $new_data; @@ -500,9 +500,9 @@ class PMA_Tracker $sql_query = " UPDATE " . self::$pma_table . " SET `" . $save_to . "` = '" . $new_data_processed . "' " . - " WHERE `db_name` = '" . PMA_sqlAddslashes($dbname) . "' " . - " AND `table_name` = '" . PMA_sqlAddslashes($tablename) . "' " . - " AND `version` = '" . PMA_sqlAddslashes($version) . "' "; + " WHERE `db_name` = '" . PMA_sqlAddSlashes($dbname) . "' " . + " AND `table_name` = '" . PMA_sqlAddSlashes($tablename) . "' " . + " AND `version` = '" . PMA_sqlAddSlashes($version) . "' "; $result = PMA_query_as_controluser($sql_query); @@ -559,8 +559,8 @@ class PMA_Tracker { $sql_query = " SELECT MAX(version) FROM " . self::$pma_table . - " WHERE `db_name` = '" . PMA_sqlAddslashes($dbname) . "' " . - " AND `table_name` = '" . PMA_sqlAddslashes($tablename) . "' "; + " WHERE `db_name` = '" . PMA_sqlAddSlashes($dbname) . "' " . + " AND `table_name` = '" . PMA_sqlAddSlashes($tablename) . "' "; if ($statement != "") { $sql_query .= " AND FIND_IN_SET('" . $statement . "',tracking) > 0" ; @@ -593,11 +593,11 @@ class PMA_Tracker self::init(); } $sql_query = " SELECT * FROM " . self::$pma_table . - " WHERE `db_name` = '" . PMA_sqlAddslashes($dbname) . "' "; + " WHERE `db_name` = '" . PMA_sqlAddSlashes($dbname) . "' "; if (! empty($tablename)) { - $sql_query .= " AND `table_name` = '" . PMA_sqlAddslashes($tablename) ."' "; + $sql_query .= " AND `table_name` = '" . PMA_sqlAddSlashes($tablename) ."' "; } - $sql_query .= " AND `version` = '" . PMA_sqlAddslashes($version) ."' ". + $sql_query .= " AND `version` = '" . PMA_sqlAddSlashes($version) ."' ". " ORDER BY `version` DESC "; $mixed = PMA_DBI_fetch_array(PMA_query_as_controluser($sql_query)); @@ -959,12 +959,12 @@ class PMA_Tracker $sql_query = " /*NOTRACK*/\n" . " UPDATE " . self::$pma_table . - " SET " . PMA_backquote($save_to) ." = CONCAT( " . PMA_backquote($save_to) . ",'\n" . PMA_sqlAddslashes($query) . "') ," . + " SET " . PMA_backquote($save_to) ." = CONCAT( " . PMA_backquote($save_to) . ",'\n" . PMA_sqlAddSlashes($query) . "') ," . " `date_updated` = '" . $date . "' "; // If table was renamed we have to change the tablename attribute in pma_tracking too if ($result['identifier'] == 'RENAME TABLE') { - $sql_query .= ', `table_name` = \'' . PMA_sqlAddslashes($result['tablename_after_rename']) . '\' '; + $sql_query .= ', `table_name` = \'' . PMA_sqlAddSlashes($result['tablename_after_rename']) . '\' '; } // Save the tracking information only for @@ -974,9 +974,9 @@ class PMA_Tracker // we want to track $sql_query .= " WHERE FIND_IN_SET('" . $result['identifier'] . "',tracking) > 0" . - " AND `db_name` = '" . PMA_sqlAddslashes($dbname) . "' " . - " AND `table_name` = '" . PMA_sqlAddslashes($result['tablename']) . "' " . - " AND `version` = '" . PMA_sqlAddslashes($version) . "' "; + " AND `db_name` = '" . PMA_sqlAddSlashes($dbname) . "' " . + " AND `table_name` = '" . PMA_sqlAddSlashes($result['tablename']) . "' " . + " AND `version` = '" . PMA_sqlAddSlashes($version) . "' "; $result = PMA_query_as_controluser($sql_query); } diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php index c7250dc..d9893dd 100644 --- a/libraries/blobstreaming.lib.php +++ b/libraries/blobstreaming.lib.php @@ -387,7 +387,7 @@ function PMA_BS_IsTablePBMSEnabled($db_name, $tbl_name, $tbl_type) // This information should be cached rather than selecting it each time. //$query = "SELECT count(*) FROM information_schema.TABLES T, pbms.pbms_enabled E where T.table_schema = ". PMA_backquote($db_name) . " and T.table_name = ". PMA_backquote($tbl_name) . " and T.engine = E.name"; - $query = "SELECT count(*) FROM pbms.pbms_enabled E where E.name = '" . PMA_sqlAddslashes($tbl_type) . "'"; + $query = "SELECT count(*) FROM pbms.pbms_enabled E where E.name = '" . PMA_sqlAddSlashes($tbl_type) . "'"; $result = PMA_DBI_query($query); $data = PMA_DBI_fetch_row($result); @@ -439,7 +439,7 @@ function PMA_BS_SetContentType($db_name, $bsTable, $blobReference, $contentType) // This is a really ugly way to do this but currently there is nothing better. // In a future version of PBMS the system tables will be redesigned to make this // more efficient. - $query = "SELECT Repository_id, Repo_blob_offset FROM pbms_reference WHERE Blob_url='" . PMA_sqlAddslashes($blobReference) . "'"; + $query = "SELECT Repository_id, Repo_blob_offset FROM pbms_reference WHERE Blob_url='" . PMA_sqlAddSlashes($blobReference) . "'"; //error_log(" PMA_BS_SetContentType: $query\n", 3, "/tmp/mylog"); $result = PMA_DBI_query($query); //error_log(" $query\n", 3, "/tmp/mylog"); @@ -451,9 +451,9 @@ function PMA_BS_SetContentType($db_name, $bsTable, $blobReference, $contentType) $result = PMA_DBI_query($query); if (PMA_DBI_num_rows($result) == 0) { - $query = "INSERT into pbms_metadata Values( ". $data['Repository_id'] . ", " . $data['Repo_blob_offset'] . ", 'Content_type', '" . PMA_sqlAddslashes($contentType) . "')"; + $query = "INSERT into pbms_metadata Values( ". $data['Repository_id'] . ", " . $data['Repo_blob_offset'] . ", 'Content_type', '" . PMA_sqlAddSlashes($contentType) . "')"; } else { - $query = "UPDATE pbms_metadata SET name = 'Content_type', Value = '" . PMA_sqlAddslashes($contentType) . "' $where"; + $query = "UPDATE pbms_metadata SET name = 'Content_type', Value = '" . PMA_sqlAddSlashes($contentType) . "' $where"; } //error_log("$query\n", 3, "/tmp/mylog"); PMA_DBI_query($query); diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php index 5492cbf..9ff7d1b 100644 --- a/libraries/bookmark.lib.php +++ b/libraries/bookmark.lib.php @@ -58,13 +58,13 @@ function PMA_Bookmark_getList($db) } $query = 'SELECT label, id FROM '. PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table']) - . ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND user = \'' . PMA_sqlAddslashes($cfgBookmark['user']) . '\'' + . ' WHERE dbase = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND user = \'' . PMA_sqlAddSlashes($cfgBookmark['user']) . '\'' . ' ORDER BY label'; $per_user = PMA_DBI_fetch_result($query, 'id', 'label', $controllink, PMA_DBI_QUERY_STORE); $query = 'SELECT label, id FROM '. PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table']) - . ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\'' + . ' WHERE dbase = \'' . PMA_sqlAddSlashes($db) . '\'' . ' AND user = \'\'' . ' ORDER BY label'; $global = PMA_DBI_fetch_result($query, 'id', 'label', $controllink, PMA_DBI_QUERY_STORE); @@ -107,10 +107,10 @@ function PMA_Bookmark_get($db, $id, $id_field = 'id', $action_bookmark_all = fal } $query = 'SELECT query FROM ' . PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table']) - . ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\''; + . ' WHERE dbase = \'' . PMA_sqlAddSlashes($db) . '\''; if (!$action_bookmark_all) { - $query .= ' AND (user = \'' . PMA_sqlAddslashes($cfgBookmark['user']) . '\''; + $query .= ' AND (user = \'' . PMA_sqlAddSlashes($cfgBookmark['user']) . '\''; if (!$exact_user_match) { $query .= ' OR user = \'\''; } @@ -146,7 +146,7 @@ function PMA_Bookmark_save($fields, $all_users = false) } $query = 'INSERT INTO ' . PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table']) - . ' (id, dbase, user, query, label) VALUES (NULL, \'' . PMA_sqlAddslashes($fields['dbase']) . '\', \'' . ($all_users ? '' : PMA_sqlAddslashes($fields['user'])) . '\', \'' . PMA_sqlAddslashes(urldecode($fields['query'])) . '\', \'' . PMA_sqlAddslashes($fields['label']) . '\')'; + . ' (id, dbase, user, query, label) VALUES (NULL, \'' . PMA_sqlAddSlashes($fields['dbase']) . '\', \'' . ($all_users ? '' : PMA_sqlAddSlashes($fields['user'])) . '\', \'' . PMA_sqlAddSlashes(urldecode($fields['query'])) . '\', \'' . PMA_sqlAddSlashes($fields['label']) . '\')'; return PMA_DBI_query($query, $controllink); } // end of the 'PMA_Bookmark_save()' function @@ -172,7 +172,7 @@ function PMA_Bookmark_delete($db, $id) } $query = 'DELETE FROM ' . PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table']) - . ' WHERE (user = \'' . PMA_sqlAddslashes($cfgBookmark['user']) . '\'' + . ' WHERE (user = \'' . PMA_sqlAddSlashes($cfgBookmark['user']) . '\'' . ' OR user = \'\')' . ' AND id = ' . $id; return PMA_DBI_try_query($query, $controllink); diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 7dcbea0..61f3102 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -161,7 +161,7 @@ function PMA_displayMaximumUploadSize($max_upload_size) * * @access public */ -function PMA_sqlAddslashes($a_string = '', $is_like = false, $crlf = false, $php_code = false) +function PMA_sqlAddSlashes($a_string = '', $is_like = false, $crlf = false, $php_code = false) { if ($is_like) { $a_string = str_replace('\\', '\\\\\\\\', $a_string); @@ -182,7 +182,7 @@ function PMA_sqlAddslashes($a_string = '', $is_like = false, $crlf = false, $php } return $a_string; -} // end of the 'PMA_sqlAddslashes()' function +} // end of the 'PMA_sqlAddSlashes()' function /** @@ -1996,7 +1996,7 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force $condition .= "= b'" . PMA_printable_bit_value($row[$i], $meta->length) . "' AND"; } else { $condition .= '= \'' - . PMA_sqlAddslashes($row[$i], false, true) . '\' AND'; + . PMA_sqlAddSlashes($row[$i], false, true) . '\' AND'; } } if ($meta->primary_key > 0) { @@ -3082,7 +3082,7 @@ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null) 'SCHEMA_PRIVILEGES', $username, $priv, - PMA_sqlAddslashes($db)))) { + PMA_sqlAddSlashes($db)))) { return true; } } else { @@ -3098,8 +3098,8 @@ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null) 'TABLE_PRIVILEGES', $username, $priv, - PMA_sqlAddslashes($db), - PMA_sqlAddslashes($tbl)))) { + PMA_sqlAddSlashes($db), + PMA_sqlAddSlashes($tbl)))) { return true; } } diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index d9f19f3..50ae58b 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -323,7 +323,7 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals // added BINARY in the WHERE clause to force a case sensitive // comparison (if we are looking for the db Aa we don't want // to find the db aa) - $this_databases = array_map('PMA_sqlAddslashes', $databases); + $this_databases = array_map('PMA_sqlAddSlashes', $databases); $sql = ' SELECT *, @@ -992,7 +992,7 @@ function PMA_DBI_postConnect($link, $is_controluser = false) if (!PMA_DRIZZLE) { if (! empty($GLOBALS['collation_connection'])) { PMA_DBI_query("SET CHARACTER SET 'utf8';", $link, PMA_DBI_QUERY_STORE); - PMA_DBI_query("SET collation_connection = '" . PMA_sqlAddslashes($GLOBALS['collation_connection']) . "';", $link, PMA_DBI_QUERY_STORE); + PMA_DBI_query("SET collation_connection = '" . PMA_sqlAddSlashes($GLOBALS['collation_connection']) . "';", $link, PMA_DBI_QUERY_STORE); } else { PMA_DBI_query("SET NAMES 'utf8' COLLATE 'utf8_general_ci';", $link, PMA_DBI_QUERY_STORE); } @@ -1373,14 +1373,14 @@ function PMA_DBI_get_triggers($db, $table = '', $delimiter = '//') // Note: in http://dev.mysql.com/doc/refman/5.0/en/faqs-triggers.html // their example uses WHERE TRIGGER_SCHEMA='dbname' so let's use this // instead of WHERE EVENT_OBJECT_SCHEMA='dbname' - $query = "SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION, EVENT_OBJECT_TABLE, ACTION_TIMING, ACTION_STATEMENT, EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA= '" . PMA_sqlAddslashes($db,true) . "';"; + $query = "SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION, EVENT_OBJECT_TABLE, ACTION_TIMING, ACTION_STATEMENT, EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA= '" . PMA_sqlAddSlashes($db,true) . "';"; if (! empty($table)) { - $query .= " AND EVENT_OBJECT_TABLE = '" . PMA_sqlAddslashes($table, true) . "';"; + $query .= " AND EVENT_OBJECT_TABLE = '" . PMA_sqlAddSlashes($table, true) . "';"; } } else { - $query = "SHOW TRIGGERS FROM " . PMA_backquote(PMA_sqlAddslashes($db,true)); + $query = "SHOW TRIGGERS FROM " . PMA_backquote(PMA_sqlAddSlashes($db,true)); if (! empty($table)) { - $query .= " LIKE '" . PMA_sqlAddslashes($table, true) . "';"; + $query .= " LIKE '" . PMA_sqlAddSlashes($table, true) . "';"; } } @@ -1424,8 +1424,8 @@ function PMA_isView($db, $view_name) $result = PMA_DBI_fetch_result( "SELECT TABLE_NAME FROM information_schema.VIEWS - WHERE TABLE_SCHEMA = '" . PMA_sqlAddslashes($db) . "' - AND TABLE_NAME = '" . PMA_sqlAddslashes($view_name) . "'"); + WHERE TABLE_SCHEMA = '" . PMA_sqlAddSlashes($db) . "' + AND TABLE_NAME = '" . PMA_sqlAddSlashes($view_name) . "'"); if ($result) { return true; diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php index 4aa68a8..adf265e 100644 --- a/libraries/db_events.inc.php +++ b/libraries/db_events.inc.php @@ -8,7 +8,7 @@ if (! defined('PHPMYADMIN')) { exit; } -$events = PMA_DBI_fetch_result('SELECT EVENT_NAME, EVENT_TYPE FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';'); +$events = PMA_DBI_fetch_result('SELECT EVENT_NAME, EVENT_TYPE FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddSlashes($db,true) . '\';'); $conditional_class_add = ''; $conditional_class_drop = ''; diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index 9d6dcf6..eebad23 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -130,7 +130,7 @@ if (true === $cfg['SkipLockedTables']) { if (! isset($sot_cache[$tmp[0]])) { $sts_result = PMA_DBI_query( 'SHOW TABLE STATUS FROM ' . PMA_backquote($db) - . ' LIKE \'' . PMA_sqlAddSlashes($tmp[0]) . '\';'); + . ' LIKE \'' . PMA_sqlAddSlashes($tmp[0], true) . '\';'); $sts_tmp = PMA_DBI_fetch_assoc($sts_result); PMA_DBI_free_result($sts_result); unset($sts_result); diff --git a/libraries/db_routines.lib.php b/libraries/db_routines.lib.php index dde8b79..7591d39 100644 --- a/libraries/db_routines.lib.php +++ b/libraries/db_routines.lib.php @@ -186,8 +186,8 @@ function PMA_RTN_getRoutineDataFromName($db, $name, $all = true) $fields = "SPECIFIC_NAME, ROUTINE_TYPE, DTD_IDENTIFIER, " . "ROUTINE_DEFINITION, IS_DETERMINISTIC, SQL_DATA_ACCESS, " . "ROUTINE_COMMENT, SECURITY_TYPE"; - $where = "ROUTINE_SCHEMA='" . PMA_sqlAddslashes($db) . "' " - . "AND SPECIFIC_NAME='" . PMA_sqlAddslashes($name) . "'"; + $where = "ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "' " + . "AND SPECIFIC_NAME='" . PMA_sqlAddSlashes($name) . "'"; $query = "SELECT $fields FROM INFORMATION_SCHEMA.ROUTINES WHERE $where;"; $routine = PMA_DBI_fetch_single_row($query); @@ -1127,7 +1127,7 @@ function PMA_RTN_getRoutinesList() * Get the routines */ $columns = "`SPECIFIC_NAME`, `ROUTINE_NAME`, `ROUTINE_TYPE`, `DTD_IDENTIFIER`, `ROUTINE_DEFINITION`"; - $where = "ROUTINE_SCHEMA='" . PMA_sqlAddslashes($db) . "'"; + $where = "ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "'"; $routines = PMA_DBI_fetch_result("SELECT $columns FROM `INFORMATION_SCHEMA`.`ROUTINES` WHERE $where;"); /** * Conditional classes switch the list on or off diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php index 8eb93e4..97b7ec8 100644 --- a/libraries/db_table_exists.lib.php +++ b/libraries/db_table_exists.lib.php @@ -46,7 +46,7 @@ if (empty($is_table) && !defined('PMA_SUBMIT_MULT') && ! defined('TABLE_MAY_BE_A if (! $is_table) { $_result = PMA_DBI_try_query( - 'SHOW TABLES LIKE \'' . PMA_sqlAddslashes($table, true) . '\';', + 'SHOW TABLES LIKE \'' . PMA_sqlAddSlashes($table, true) . '\';', null, PMA_DBI_QUERY_STORE); $is_table = @PMA_DBI_num_rows($_result); PMA_DBI_free_result($_result); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 0b63a1e..8fd73de 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1587,7 +1587,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // do not wrap if date field type $nowrap = ((preg_match('@DATE|TIME@i', $meta->type) || $bool_nowrap) ? ' nowrap' : ''); - $where_comparison = ' = \'' . PMA_sqlAddslashes($row[$i]) . '\''; + $where_comparison = ' = \'' . PMA_sqlAddSlashes($row[$i]) . '\''; $vertical_display['data'][$row_no][$i] = '<td ' . PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $map, $row[$i], $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated); } else { diff --git a/libraries/export/sql.php b/libraries/export/sql.php index ed61a07..3b0d968 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -595,7 +595,7 @@ function PMA_exportDBFooter($db) $delimiter = '$$'; if (PMA_MYSQL_INT_VERSION > 50100) { - $event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';'); + $event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddSlashes($db,true) . '\';'); } else { $event_names = array(); } @@ -690,7 +690,7 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a $new_crlf = $crlf; // need to use PMA_DBI_QUERY_STORE with PMA_DBI_num_rows() in mysqli - $result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddslashes($table) . '\'', null, PMA_DBI_QUERY_STORE); + $result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddSlashes($table, true) . '\'', null, PMA_DBI_QUERY_STORE); if ($result != false) { if (PMA_DBI_num_rows($result) > 0) { $tmpres = PMA_DBI_fetch_assoc($result); @@ -1184,10 +1184,10 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) } // detection of 'bit' works only on mysqli extension } elseif ($fields_meta[$j]->type == 'bit') { - $values[] = "b'" . PMA_sqlAddslashes(PMA_printable_bit_value($row[$j], $fields_meta[$j]->length)) . "'"; + $values[] = "b'" . PMA_sqlAddSlashes(PMA_printable_bit_value($row[$j], $fields_meta[$j]->length)) . "'"; // something else -> treat as a string } else { - $values[] = '\'' . str_replace($search, $replace, PMA_sqlAddslashes($row[$j])) . '\''; + $values[] = '\'' . str_replace($search, $replace, PMA_sqlAddSlashes($row[$j])) . '\''; } // end if } // end for diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 75e65a0..e2cbdd2 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -987,7 +987,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = } $tempSQLStr .= (($is_varchar) ? "'" : ""); - $tempSQLStr .= PMA_sqlAddslashes((string)$tables[$i][ROWS][$j][$k]); + $tempSQLStr .= PMA_sqlAddSlashes((string)$tables[$i][ROWS][$j][$k]); $tempSQLStr .= (($is_varchar) ? "'" : ""); if ($k != ($num_cols - 1)) { diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php index 3ac799f..4ba089a 100644 --- a/libraries/import/docsql.php +++ b/libraries/import/docsql.php @@ -68,10 +68,10 @@ if ($data === true && !$error && !$timeout_passed) { ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) . ' (db_name, table_name, column_name, ' . PMA_backquote('comment') . ') VALUES ( - \'' . PMA_sqlAddslashes($GLOBALS['db']) . '\', - \'' . PMA_sqlAddslashes(trim($tab)) . '\', - \'' . PMA_sqlAddslashes(trim($inf[0])) . '\', - \'' . PMA_sqlAddslashes(trim($inf[1])) . '\')'; + \'' . PMA_sqlAddSlashes($GLOBALS['db']) . '\', + \'' . PMA_sqlAddSlashes(trim($tab)) . '\', + \'' . PMA_sqlAddSlashes(trim($inf[0])) . '\', + \'' . PMA_sqlAddSlashes(trim($inf[1])) . '\')'; PMA_importRunQuery($qry, $qry . '-- ' . htmlspecialchars($tab) . '.' . htmlspecialchars($inf[0]), true); } // end inf[1] exists if (!empty($inf[2]) && strlen(trim($inf[2])) > 0) { @@ -81,12 +81,12 @@ if ($data === true && !$error && !$timeout_passed) { ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation']) . ' (master_db, master_table, master_field, foreign_db, foreign_table, foreign_field) VALUES ( - \'' . PMA_sqlAddslashes($GLOBALS['db']) . '\', - \'' . PMA_sqlAddslashes(trim($tab)) . '\', - \'' . PMA_sqlAddslashes(trim($inf[0])) . '\', - \'' . PMA_sqlAddslashes($GLOBALS['db']) . '\', - \'' . PMA_sqlAddslashes(trim($for[0])) . '\', - \'' . PMA_sqlAddslashes(trim($for[1])) . '\')'; + \'' . PMA_sqlAddSlashes($GLOBALS['db']) . '\', + \'' . PMA_sqlAddSlashes(trim($tab)) . '\', + \'' . PMA_sqlAddSlashes(trim($inf[0])) . '\', + \'' . PMA_sqlAddSlashes($GLOBALS['db']) . '\', + \'' . PMA_sqlAddSlashes(trim($for[0])) . '\', + \'' . PMA_sqlAddSlashes(trim($for[1])) . '\')'; PMA_importRunQuery($qry, $qry . '-- ' . htmlspecialchars($tab) . '.' . htmlspecialchars($inf[0]) . '(' . htmlspecialchars($inf[2]) . ')', true); } // end inf[2] exists } // End lines loop diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php index 56dabf9..fe5264c 100644 --- a/libraries/import/ldi.php +++ b/libraries/import/ldi.php @@ -63,7 +63,7 @@ $sql = 'LOAD DATA'; if (isset($ldi_local_option)) { $sql .= ' LOCAL'; } -$sql .= ' INFILE \'' . PMA_sqlAddslashes($import_file) . '\''; +$sql .= ' INFILE \'' . PMA_sqlAddSlashes($import_file) . '\''; if (isset($ldi_replace)) { $sql .= ' REPLACE'; } elseif (isset($ldi_ignore)) { @@ -75,10 +75,10 @@ if (strlen($ldi_terminated) > 0) { $sql .= ' FIELDS TERMINATED BY \'' . $ldi_terminated . '\''; } if (strlen($ldi_enclosed) > 0) { - $sql .= ' ENCLOSED BY \'' . PMA_sqlAddslashes($ldi_enclosed) . '\''; + $sql .= ' ENCLOSED BY \'' . PMA_sqlAddSlashes($ldi_enclosed) . '\''; } if (strlen($ldi_escaped) > 0) { - $sql .= ' ESCAPED BY \'' . PMA_sqlAddslashes($ldi_escaped) . '\''; + $sql .= ' ESCAPED BY \'' . PMA_sqlAddSlashes($ldi_escaped) . '\''; } if (strlen($ldi_new_line) > 0){ if ($ldi_new_line == 'auto') { diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 9ac5282..c2acd8e 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -380,10 +380,10 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') `foreign_table`, `foreign_field` FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation']) . ' - WHERE `master_db` = \'' . PMA_sqlAddslashes($db) . '\' - AND `master_table` = \'' . PMA_sqlAddslashes($table) . '\' '; + WHERE `master_db` = \'' . PMA_sqlAddSlashes($db) . '\' + AND `master_table` = \'' . PMA_sqlAddSlashes($table) . '\' '; if (strlen($column)) { - $rel_query .= ' AND `master_field` = \'' . PMA_sqlAddslashes($column) . '\''; + $rel_query .= ' AND `master_field` = \'' . PMA_sqlAddSlashes($column) . '\''; } $foreign = PMA_DBI_fetch_result($rel_query, 'master_field', null, $GLOBALS['controllink']); } @@ -473,8 +473,8 @@ function PMA_getDisplayField($db, $table) $disp_query = ' SELECT `display_field` FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_info']) . ' - WHERE `db_name` = \'' . PMA_sqlAddslashes($db) . '\' - AND `table_name` = \'' . PMA_sqlAddslashes($table) . '\''; + WHERE `db_name` = \'' . PMA_sqlAddSlashes($db) . '\' + AND `table_name` = \'' . PMA_sqlAddSlashes($table) . '\''; $row = PMA_DBI_fetch_single_row($disp_query, 'ASSOC', $GLOBALS['controllink']); if (isset($row['display_field'])) { @@ -545,7 +545,7 @@ function PMA_getDbComment($db) $com_qry = " SELECT `comment` FROM " . PMA_backquote($cfgRelation['db']) . "." . PMA_backquote($cfgRelation['column_info']) . " - WHERE db_name = '" . PMA_sqlAddslashes($db) . "' + WHERE db_name = '" . PMA_sqlAddSlashes($db) . "' AND table_name = '' AND column_name = '(db_comment)'"; $com_rs = PMA_query_as_controluser($com_qry, true, PMA_DBI_QUERY_STORE); @@ -613,17 +613,17 @@ function PMA_setDbComment($db, $comment = '') " . PMA_backquote($cfgRelation['db']) . "." . PMA_backquote($cfgRelation['column_info']) . " (`db_name`, `table_name`, `column_name`, `comment`) VALUES ( - '" . PMA_sqlAddslashes($db) . "', + '" . PMA_sqlAddSlashes($db) . "', '', '(db_comment)', - '" . PMA_sqlAddslashes($comment) . "') + '" . PMA_sqlAddSlashes($comment) . "') ON DUPLICATE KEY UPDATE - `comment` = '" . PMA_sqlAddslashes($comment) . "'"; + `comment` = '" . PMA_sqlAddSlashes($comment) . "'"; } else { $upd_query = ' DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) . ' - WHERE `db_name` = \'' . PMA_sqlAddslashes($db) . '\' + WHERE `db_name` = \'' . PMA_sqlAddSlashes($db) . '\' AND `table_name` = \'\' AND `column_name` = \'(db_comment)\''; } @@ -686,11 +686,11 @@ function PMA_setHistory($db, $table, $username, $sqlquery) `timevalue`, `sqlquery`) VALUES - (\'' . PMA_sqlAddslashes($username) . '\', - \'' . PMA_sqlAddslashes($db) . '\', - \'' . PMA_sqlAddslashes($table) . '\', + (\'' . PMA_sqlAddSlashes($username) . '\', + \'' . PMA_sqlAddSlashes($db) . '\', + \'' . PMA_sqlAddSlashes($table) . '\', NOW(), - \'' . PMA_sqlAddslashes($sqlquery) . '\')'); + \'' . PMA_sqlAddSlashes($sqlquery) . '\')'); } // end of 'PMA_setHistory()' function /** @@ -713,7 +713,7 @@ function PMA_getHistory($username) `table`, `sqlquery` FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['history']) . ' - WHERE `username` = \'' . PMA_sqlAddslashes($username) . '\' + WHERE `username` = \'' . PMA_sqlAddSlashes($username) . '\' ORDER BY `id` DESC'; return PMA_DBI_fetch_result($hist_query, null, null, $GLOBALS['controllink']); @@ -930,9 +930,9 @@ function PMA_getForeignData($foreigners, $field, $override_total, $foreign_filte . (($foreign_display == false) ? '' : ', ' . PMA_backquote($foreign_display)); $f_query_from = ' FROM ' . PMA_backquote($foreign_db) . '.' . PMA_backquote($foreign_table); $f_query_filter = empty($foreign_filter) ? '' : ' WHERE ' . PMA_backquote($foreign_field) - . ' LIKE "%' . PMA_sqlAddslashes($foreign_filter, true) . '%"' + . ' LIKE "%' . PMA_sqlAddSlashes($foreign_filter, true) . '%"' . (($foreign_display == false) ? '' : ' OR ' . PMA_backquote($foreign_display) - . ' LIKE "%' . PMA_sqlAddslashes($foreign_filter, true) . '%"' + . ' LIKE "%' . PMA_sqlAddSlashes($foreign_filter, true) . '%"' ); $f_query_order = ($foreign_display == false) ? '' :' ORDER BY ' . PMA_backquote($foreign_table) . '.' . PMA_backquote($foreign_display); $f_query_limit = isset($foreign_limit) ? $foreign_limit : ''; @@ -999,8 +999,8 @@ function PMA_getRelatives($from) $rel_query = 'SELECT *' . ' FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['relation']) - . ' WHERE ' . $from . '_db = \'' . PMA_sqlAddslashes($GLOBALS['db']) . '\'' - . ' AND ' . $to . '_db = \'' . PMA_sqlAddslashes($GLOBALS['db']) . '\'' + . ' WHERE ' . $from . '_db = \'' . PMA_sqlAddSlashes($GLOBALS['db']) . '\'' + . ' AND ' . $to . '_db = \'' . PMA_sqlAddSlashes($GLOBALS['db']) . '\'' . ' AND ' . $from . '_table IN ' . $in_know . ' AND ' . $to . '_table IN ' . $in_left; $relations = @PMA_DBI_query($rel_query, $GLOBALS['controllink']); @@ -1038,26 +1038,26 @@ function PMA_REL_renameField($db, $table, $field, $new_name) if ($cfgRelation['displaywork']) { $table_query = 'UPDATE ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_info']) - . ' SET display_field = \'' . PMA_sqlAddslashes($new_name) . '\'' - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'' - . ' AND display_field = \'' . PMA_sqlAddslashes($field) . '\''; + . ' SET display_field = \'' . PMA_sqlAddSlashes($new_name) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\'' + . ' AND display_field = \'' . PMA_sqlAddSlashes($field) . '\''; PMA_query_as_controluser($table_query); } if ($cfgRelation['relwork']) { $table_query = 'UPDATE ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation']) - . ' SET master_field = \'' . PMA_sqlAddslashes($new_name) . '\'' - . ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND master_table = \'' . PMA_sqlAddslashes($table) . '\'' - . ' AND master_field = \'' . PMA_sqlAddslashes($field) . '\''; + . ' SET master_field = \'' . PMA_sqlAddSlashes($new_name) . '\'' + . ' WHERE master_db = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND master_table = \'' . PMA_sqlAddSlashes($table) . '\'' + . ' AND master_field = \'' . PMA_sqlAddSlashes($field) . '\''; PMA_query_as_controluser($table_query); $table_query = 'UPDATE ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation']) - . ' SET foreign_field = \'' . PMA_sqlAddslashes($new_name) . '\'' - . ' WHERE foreign_db = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND foreign_table = \'' . PMA_sqlAddslashes($table) . '\'' - . ' AND foreign_field = \'' . PMA_sqlAddslashes($field) . '\''; + . ' SET foreign_field = \'' . PMA_sqlAddSlashes($new_name) . '\'' + . ' WHERE foreign_db = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND foreign_table = \'' . PMA_sqlAddSlashes($table) . '\'' + . ' AND foreign_field = \'' . PMA_sqlAddSlashes($field) . '\''; PMA_query_as_controluser($table_query); } // end if relwork } @@ -1077,7 +1077,7 @@ function PMA_REL_create_page($newpage, $cfgRelation, $db, $query_default_option) } $ins_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) . ' (db_name, page_descr)' - . ' VALUES (\'' . PMA_sqlAddslashes($db) . '\', \'' . PMA_sqlAddslashes($newpage) . '\')'; + . ' VALUES (\'' . PMA_sqlAddSlashes($db) . '\', \'' . PMA_sqlAddSlashes($newpage) . '\')'; PMA_query_as_controluser($ins_query, false, $query_default_option); return PMA_DBI_insert_id(isset($GLOBALS['controllink']) ? $GLOBALS['controllink'] : ''); } diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php index a03cf1f..3546fbb 100644 --- a/libraries/relation_cleanup.lib.php +++ b/libraries/relation_cleanup.lib.php @@ -22,31 +22,31 @@ function PMA_relationsCleanupColumn($db, $table, $column) if ($cfgRelation['commwork']) { $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'' - . ' AND column_name = \'' . PMA_sqlAddslashes($column) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\'' + . ' AND column_name = \'' . PMA_sqlAddSlashes($column) . '\''; PMA_query_as_controluser($remove_query); } if ($cfgRelation['displaywork']) { $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_info']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'' - . ' AND display_field = \'' . PMA_sqlAddslashes($column) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\'' + . ' AND display_field = \'' . PMA_sqlAddSlashes($column) . '\''; PMA_query_as_controluser($remove_query); } if ($cfgRelation['relwork']) { $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation']) - . ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND master_table = \'' . PMA_sqlAddslashes($table) . '\'' - . ' AND master_field = \'' . PMA_sqlAddslashes($column) . '\''; + . ' WHERE master_db = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND master_table = \'' . PMA_sqlAddSlashes($table) . '\'' + . ' AND master_field = \'' . PMA_sqlAddSlashes($column) . '\''; PMA_query_as_controluser($remove_query); $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation']) - . ' WHERE foreign_db = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND foreign_table = \'' . PMA_sqlAddslashes($table) . '\'' - . ' AND foreign_field = \'' . PMA_sqlAddslashes($column) . '\''; + . ' WHERE foreign_db = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND foreign_table = \'' . PMA_sqlAddSlashes($table) . '\'' + . ' AND foreign_field = \'' . PMA_sqlAddSlashes($column) . '\''; PMA_query_as_controluser($remove_query); } } @@ -63,41 +63,41 @@ function PMA_relationsCleanupTable($db, $table) if ($cfgRelation['commwork']) { $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\''; PMA_query_as_controluser($remove_query); } if ($cfgRelation['displaywork']) { $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_info']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\''; PMA_query_as_controluser($remove_query); } if ($cfgRelation['pdfwork']) { $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\''; PMA_query_as_controluser($remove_query); } if ($cfgRelation['designerwork']) { $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['designer_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\''; PMA_query_as_controluser($remove_query); } if ($cfgRelation['relwork']) { $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation']) - . ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND master_table = \'' . PMA_sqlAddslashes($table) . '\''; + . ' WHERE master_db = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND master_table = \'' . PMA_sqlAddSlashes($table) . '\''; PMA_query_as_controluser($remove_query); $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation']) - . ' WHERE foreign_db = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND foreign_table = \'' . PMA_sqlAddslashes($table) . '\''; + . ' WHERE foreign_db = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND foreign_table = \'' . PMA_sqlAddSlashes($table) . '\''; PMA_query_as_controluser($remove_query); } } @@ -113,45 +113,45 @@ function PMA_relationsCleanupDatabase($db) if ($cfgRelation['commwork']) { $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''; PMA_query_as_controluser($remove_query); } if ($cfgRelation['bookmarkwork']) { $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['bookmark']) - . ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\''; + . ' WHERE dbase = \'' . PMA_sqlAddSlashes($db) . '\''; PMA_query_as_controluser($remove_query); } if ($cfgRelation['displaywork']) { $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_info']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''; PMA_query_as_controluser($remove_query); } if ($cfgRelation['pdfwork']) { $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''; PMA_query_as_controluser($remove_query); $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''; PMA_query_as_controluser($remove_query); } if ($cfgRelation['designerwork']) { $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['designer_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''; PMA_query_as_controluser($remove_query); } if ($cfgRelation['relwork']) { $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation']) - . ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\''; + . ' WHERE master_db = \'' . PMA_sqlAddSlashes($db) . '\''; PMA_query_as_controluser($remove_query); $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['relation']) - . ' WHERE foreign_db = \'' . PMA_sqlAddslashes($db) . '\''; + . ' WHERE foreign_db = \'' . PMA_sqlAddSlashes($db) . '\''; PMA_query_as_controluser($remove_query); } } diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php index e2f5236..bccf214 100644 --- a/libraries/schema/Dia_Relation_Schema.class.php +++ b/libraries/schema/Dia_Relation_Schema.class.php @@ -240,8 +240,8 @@ class Table_Stats $sql = 'SELECT x, y FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($tableName) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($tableName) . '\'' . ' AND pdf_page_number = ' . $pageNumber; $result = PMA_query_as_controluser($sql, false, PMA_DBI_QUERY_STORE); if (!$result || !PMA_DBI_num_rows($result)) { diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php index 7dbec6d..50ea7e3 100644 --- a/libraries/schema/Eps_Relation_Schema.class.php +++ b/libraries/schema/Eps_Relation_Schema.class.php @@ -427,8 +427,8 @@ class Table_Stats // x and y $sql = 'SELECT x, y FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($tableName) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($tableName) . '\'' . ' AND pdf_page_number = ' . $pageNumber; $result = PMA_query_as_controluser($sql, false, PMA_DBI_QUERY_STORE); diff --git a/libraries/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php index 6c9cca7..bfdb063 100644 --- a/libraries/schema/Export_Relation_Schema.class.php +++ b/libraries/schema/Export_Relation_Schema.class.php @@ -162,7 +162,7 @@ class PMA_Export_Relation_Schema global $cfgRelation; // Get All tables $tab_sql = 'SELECT table_name FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' . ' AND pdf_page_number = ' . $pageNumber; $tab_rs = PMA_query_as_controluser($tab_sql, null, PMA_DBI_QUERY_STORE); @@ -170,7 +170,7 @@ class PMA_Export_Relation_Schema $this->dieSchema('',__('This page does not contain any tables!')); } while ($curr_table = @PMA_DBI_fetch_assoc($tab_rs)) { - $alltables[] = PMA_sqlAddslashes($curr_table['table_name']); + $alltables[] = PMA_sqlAddSlashes($curr_table['table_name']); } return $alltables; } diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index d6f212f..abdcf6cschema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.phpuote($cfgRelation['table_coords'])y);true););nsform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated);'label']) . '\')';�+6 ��!�!�Ru��Ru�xd�V�+��Ru�"�nU�+�nU�+�Ru��nU�+O�Ru��_�V�+�nU�+P�V�+�T�V�+�Y�V�+�4pU�+xd�V�+��Ru�`�Ru��nU�+�!�!�Ru��Ru��-kV�+p�Ru�"�nU�+�nU�+�Ru��nU�+O�Ru�@�Ru�8�Ru�ˏU�+�p��Ru��nU�+�4pU�+p�Ru�@�Ru��nU�+GHIJKMNOP�Ru��Ru�H�AV�+�Ru�"�nU�+�nU�+�Ru�0_�V�+�nU�+p�V�+�V�+P�V�+�T�V�+�Y�V�+�4pU�+H�AV�+�Ru�P�Ru��nU�+8�AV�+�Ru��Ru��nU�+(�AV�+�Ru��Ru��nU�+�AV�+�Ru��Ru��nU�+ �^�V�+�nU�+�Y�V�+`�Ru��hV�+�nU�+�T�V�+��Ru�yhV�+�nU�+P�V�+��Ru�ZhV�+�nU�+�V�+p�V�+�V�+P�V�+�t�V�+�T�V�+�Y�V�+�4pU�+�]V�+0�Ru��Ru��nU�+#%')*-.035678:<=�Ru��Ru�p��U�+P�Ru�"�nU�+8�V�+�nU�+�t�V�+�y�V�+�4pU�+cfݵU�+��Ru�p��U�+P�Ru� �Ru��nU�+�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv�r�U�+��Ru�F�RW�+F�RW�+?ŸU�+��Ru��Ru��Ru�ݵU�+�nU�+�ďU�+�Ru�B�RW�+��Ru�O�Ru��\�U�+��Ru��B�RW�+��Ru��nU 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -219,7 +219,7 @@ class PMA_PDF extends TCPDF global $cfgRelation, $db, $pdf_page_number, $with_doc; if ($with_doc) { $test_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' . ' AND page_nr = \'' . $pdf_page_number . '\''; $test_rs = PMA_query_as_controluser($test_query); $pages = @PMA_DBI_fetch_assoc($test_rs); @@ -510,8 +510,8 @@ class Table_Stats } $sql = 'SELECT x, y FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($tableName) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($tableName) . '\'' . ' AND pdf_page_number = ' . $pageNumber; $result = PMA_query_as_controluser($sql, false, PMA_DBI_QUERY_STORE); if (!$result || !PMA_DBI_num_rows($result)) { diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php index 73d67e9..c845efe 100644 --- a/libraries/schema/Svg_Relation_Schema.class.php +++ b/libraries/schema/Svg_Relation_Schema.class.php @@ -397,8 +397,8 @@ class Table_Stats // x and y $sql = 'SELECT x, y FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($tableName) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($tableName) . '\'' . ' AND pdf_page_number = ' . $pageNumber; $result = PMA_query_as_controluser($sql, false, PMA_DBI_QUERY_STORE); diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 98216fe..641acf4 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -134,7 +134,7 @@ class PMA_User_Schema { global $db,$table,$query_default_option,$cfgRelation; $page_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''; $page_rs = PMA_query_as_controluser($page_query, false, $query_default_option); if ($page_rs && PMA_DBI_num_rows($page_rs) > 0) { ?> @@ -207,8 +207,8 @@ class PMA_User_Schema <h2><?php echo __('Select Tables') ;?></h2> <?php $page_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND pdf_page_number = \'' . PMA_sqlAddslashes($this->chosenPage) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND pdf_page_number = \'' . PMA_sqlAddSlashes($this->chosenPage) . '\''; $page_rs = PMA_query_as_controluser($page_query, false, $query_default_option); $array_sh_page = array(); while ($temp_sh_page = @PMA_DBI_fetch_assoc($page_rs)) { @@ -540,9 +540,9 @@ class PMA_User_Schema { foreach ($delrow as $current_row) { $del_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' ' . "\n" - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . "\n" - . ' AND table_name = \'' . PMA_sqlAddslashes($current_row) . '\'' . "\n" - . ' AND pdf_page_number = \'' . PMA_sqlAddslashes($chpage) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' . "\n" + . ' AND table_name = \'' . PMA_sqlAddSlashes($current_row) . '\'' . "\n" + . ' AND pdf_page_number = \'' . PMA_sqlAddSlashes($chpage) . '\''; echo $del_query; PMA_query_as_controluser($del_query, false, $query_default_option); } @@ -585,8 +585,8 @@ class PMA_User_Schema public function deleteCoordinates($db, $cfgRelation, $choosePage, $query_default_option) { $query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND pdf_page_number = \'' . PMA_sqlAddslashes($choosePage) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND pdf_page_number = \'' . PMA_sqlAddSlashes($choosePage) . '\''; PMA_query_as_controluser($query, false, $query_default_option); } @@ -602,8 +602,8 @@ class PMA_User_Schema public function deletePages($db, $cfgRelation, $choosePage, $query_default_option) { $query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND page_nr = \'' . PMA_sqlAddslashes($choosePage) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND page_nr = \'' . PMA_sqlAddSlashes($choosePage) . '\''; PMA_query_as_controluser($query, false, $query_default_option); } @@ -734,7 +734,7 @@ class PMA_User_Schema */ $insert_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' ' . '(db_name, table_name, pdf_page_number, x, y) ' - . 'VALUES (\'' . PMA_sqlAddslashes($db) . '\', \'' . PMA_sqlAddslashes($current_table) . '\',' . $pageNumber . ',' . $pos_x . ',' . $pos_y . ')'; + . 'VALUES (\'' . PMA_sqlAddSlashes($db) . '\', \'' . PMA_sqlAddSlashes($current_table) . '\',' . $pageNumber . ',' . $pos_x . ',' . $pos_y . ')'; PMA_query_as_controluser($insert_query, false, $query_default_option); /* @@ -787,28 +787,28 @@ class PMA_User_Schema } if (isset($arrvalue['name']) && $arrvalue['name'] != '--') { $test_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($arrvalue['name']) . '\'' - . ' AND pdf_page_number = \'' . PMA_sqlAddslashes($this->chosenPage) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($arrvalue['name']) . '\'' + . ' AND pdf_page_number = \'' . PMA_sqlAddSlashes($this->chosenPage) . '\''; $test_rs = PMA_query_as_controluser($test_query, false, $query_default_option); //echo $test_query; if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) { if (isset($arrvalue['delete']) && $arrvalue['delete'] == 'y') { $ch_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($arrvalue['name']) . '\'' - . ' AND pdf_page_number = \'' . PMA_sqlAddslashes($this->chosenPage) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($arrvalue['name']) . '\'' + . ' AND pdf_page_number = \'' . PMA_sqlAddSlashes($this->chosenPage) . '\''; } else { $ch_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' ' . 'SET x = ' . $arrvalue['x'] . ', y= ' . $arrvalue['y'] - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($arrvalue['name']) . '\'' - . ' AND pdf_page_number = \'' . PMA_sqlAddslashes($this->chosenPage) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($arrvalue['name']) . '\'' + . ' AND pdf_page_number = \'' . PMA_sqlAddSlashes($this->chosenPage) . '\''; } } else { $ch_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' ' . '(db_name, table_name, pdf_page_number, x, y) ' - . 'VALUES (\'' . PMA_sqlAddslashes($db) . '\', \'' . PMA_sqlAddslashes($arrvalue['name']) . '\', \'' . PMA_sqlAddslashes($this->chosenPage) . '\',' . $arrvalue['x'] . ',' . $arrvalue['y'] . ')'; + . 'VALUES (\'' . PMA_sqlAddSlashes($db) . '\', \'' . PMA_sqlAddSlashes($arrvalue['name']) . '\', \'' . PMA_sqlAddSlashes($this->chosenPage) . '\',' . $arrvalue['x'] . ',' . $arrvalue['y'] . ')'; } //echo $ch_query; PMA_query_as_controluser($ch_query, false, $query_default_option); diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php index 663c7e8..011e73e 100644 --- a/libraries/schema/Visio_Relation_Schema.class.php +++ b/libraries/schema/Visio_Relation_Schema.class.php @@ -243,8 +243,8 @@ class Table_Stats // x and y $sql = 'SELECT x, y FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($tableName) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($tableName) . '\'' . ' AND pdf_page_number = ' . $pageNumber; $result = PMA_query_as_controluser($sql, false, PMA_DBI_QUERY_STORE); diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 1d73f13..8f276be 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -560,11 +560,11 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, } $insert_query .= ") VALUES("; if (sizeof($table_fields[$matching_table_index]) == 1) { - $insert_query .= "'" . PMA_sqlAddslashes($result[0]) . "'"; + $insert_query .= "'" . PMA_sqlAddSlashes($result[0]) . "'"; } else { for ($field_index = 0; $field_index < sizeof($table_fields[$matching_table_index]); $field_index++) { if (isset($result[0][$table_fields[$matching_table_index][$field_index]])) { - $insert_query .= "'" . PMA_sqlAddslashes($result[0][$table_fields[$matching_table_index][$field_index]]) . "'"; + $insert_query .= "'" . PMA_sqlAddSlashes($result[0][$table_fields[$matching_table_index][$field_index]]) . "'"; } else { $insert_query .= "'NULL'"; } @@ -660,7 +660,7 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom $insert_query .= '('; $key_of_last_value = count($one_row) - 1; foreach($one_row as $key => $value) { - $insert_query .= "'" . PMA_sqlAddslashes($value) . "'"; + $insert_query .= "'" . PMA_sqlAddSlashes($value) . "'"; if ($key < $key_of_last_value) { $insert_query .= ","; } diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php index 71bbfbc..32da9c0 100644 --- a/libraries/tbl_replace_fields.inc.php +++ b/libraries/tbl_replace_fields.inc.php @@ -69,7 +69,7 @@ if (false !== $possibly_uploaded_val) { } elseif ($type == 'set') { if (! empty($_REQUEST['fields']['multi_edit'][$rownumber][$key])) { $val = implode(',', $_REQUEST['fields']['multi_edit'][$rownumber][$key]); - $val = "'" . PMA_sqlAddslashes($val) . "'"; + $val = "'" . PMA_sqlAddSlashes($val) . "'"; } } elseif ($type == 'protected') { // here we are in protected mode (asked in the config) @@ -87,9 +87,9 @@ if (false !== $possibly_uploaded_val) { } } elseif ($type == 'bit') { $val = preg_replace('/[^01]/', '0', $val); - $val = "b'" . PMA_sqlAddslashes($val) . "'"; + $val = "b'" . PMA_sqlAddSlashes($val) . "'"; } elseif (! (($type == 'datetime' || $type == 'timestamp') && $val == 'CURRENT_TIMESTAMP')) { - $val = "'" . PMA_sqlAddslashes($val) . "'"; + $val = "'" . PMA_sqlAddSlashes($val) . "'"; } // Was the Null checkbox checked for this field? diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index 98d0b14..e58ecf8 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -137,8 +137,8 @@ function PMA_getMIME($db, $table, $strict = false) `transformation`, `transformation_options` FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) . ' - WHERE `db_name` = \'' . PMA_sqlAddslashes($db) . '\' - AND `table_name` = \'' . PMA_sqlAddslashes($table) . '\' + WHERE `db_name` = \'' . PMA_sqlAddSlashes($db) . '\' + AND `table_name` = \'' . PMA_sqlAddSlashes($table) . '\' AND ( `mimetype` != \'\'' . (!$strict ? ' OR `transformation` != \'\' OR `transformation_options` != \'\'' : '') . ')'; @@ -171,9 +171,9 @@ function PMA_setMIME($db, $table, $key, $mimetype, $transformation, SELECT `mimetype`, `comment` FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) . ' - WHERE `db_name` = \'' . PMA_sqlAddslashes($db) . '\' - AND `table_name` = \'' . PMA_sqlAddslashes($table) . '\' - AND `column_name` = \'' . PMA_sqlAddslashes($key) . '\''; + WHERE `db_name` = \'' . PMA_sqlAddSlashes($db) . '\' + AND `table_name` = \'' . PMA_sqlAddSlashes($table) . '\' + AND `column_name` = \'' . PMA_sqlAddSlashes($key) . '\''; $test_rs = PMA_query_as_controluser($test_qry, true, PMA_DBI_QUERY_STORE); if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) { @@ -185,27 +185,27 @@ function PMA_setMIME($db, $table, $key, $mimetype, $transformation, || strlen($transformation_options) || strlen($row['comment']))) { $upd_query = ' UPDATE ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) . ' - SET `mimetype` = \'' . PMA_sqlAddslashes($mimetype) . '\', - `transformation` = \'' . PMA_sqlAddslashes($transformation) . '\', - `transformation_options` = \'' . PMA_sqlAddslashes($transformation_options) . '\''; + SET `mimetype` = \'' . PMA_sqlAddSlashes($mimetype) . '\', + `transformation` = \'' . PMA_sqlAddSlashes($transformation) . '\', + `transformation_options` = \'' . PMA_sqlAddSlashes($transformation_options) . '\''; } else { $upd_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']); } $upd_query .= ' - WHERE `db_name` = \'' . PMA_sqlAddslashes($db) . '\' - AND `table_name` = \'' . PMA_sqlAddslashes($table) . '\' - AND `column_name` = \'' . PMA_sqlAddslashes($key) . '\''; + WHERE `db_name` = \'' . PMA_sqlAddSlashes($db) . '\' + AND `table_name` = \'' . PMA_sqlAddSlashes($table) . '\' + AND `column_name` = \'' . PMA_sqlAddSlashes($key) . '\''; } elseif (strlen($mimetype) || strlen($transformation) || strlen($transformation_options)) { $upd_query = 'INSERT INTO ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) . ' (db_name, table_name, column_name, mimetype, transformation, transformation_options) ' . ' VALUES(' - . '\'' . PMA_sqlAddslashes($db) . '\',' - . '\'' . PMA_sqlAddslashes($table) . '\',' - . '\'' . PMA_sqlAddslashes($key) . '\',' - . '\'' . PMA_sqlAddslashes($mimetype) . '\',' - . '\'' . PMA_sqlAddslashes($transformation) . '\',' - . '\'' . PMA_sqlAddslashes($transformation_options) . '\')'; + . '\'' . PMA_sqlAddSlashes($db) . '\',' + . '\'' . PMA_sqlAddSlashes($table) . '\',' + . '\'' . PMA_sqlAddSlashes($key) . '\',' + . '\'' . PMA_sqlAddSlashes($mimetype) . '\',' + . '\'' . PMA_sqlAddSlashes($transformation) . '\',' + . '\'' . PMA_sqlAddSlashes($transformation_options) . '\')'; } if (isset($upd_query)){ diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php index 632e3e2..2246a4d 100644 --- a/libraries/user_preferences.lib.php +++ b/libraries/user_preferences.lib.php @@ -52,7 +52,7 @@ function PMA_load_userprefs() $query = ' SELECT `config_data`, UNIX_TIMESTAMP(`timevalue`) ts FROM ' . $query_table . ' - WHERE `username` = \'' . PMA_sqlAddslashes($cfgRelation['user']) . '\''; + WHERE `username` = \'' . PMA_sqlAddSlashes($cfgRelation['user']) . '\''; $row = PMA_DBI_fetch_single_row($query, 'ASSOC', $GLOBALS['controllink']); return array( @@ -90,20 +90,20 @@ function PMA_save_userprefs(array $config_array) $query = ' SELECT `username` FROM ' . $query_table . ' - WHERE `username` = \'' . PMA_sqlAddslashes($cfgRelation['user']) . '\''; + WHERE `username` = \'' . PMA_sqlAddSlashes($cfgRelation['user']) . '\''; $has_config = PMA_DBI_fetch_value($query, 0, 0, $GLOBALS['controllink']); $config_data = json_encode($config_array); if ($has_config) { $query = ' UPDATE ' . $query_table . ' - SET `config_data` = \'' . PMA_sqlAddslashes($config_data) . '\' - WHERE `username` = \'' . PMA_sqlAddslashes($cfgRelation['user']) . '\''; + SET `config_data` = \'' . PMA_sqlAddSlashes($config_data) . '\' + WHERE `username` = \'' . PMA_sqlAddSlashes($cfgRelation['user']) . '\''; } else { $query = ' INSERT INTO ' . $query_table . ' (`username`, `config_data`) - VALUES (\'' . PMA_sqlAddslashes($cfgRelation['user']) . '\', - \'' . PMA_sqlAddslashes($config_data) . '\')'; + VALUES (\'' . PMA_sqlAddSlashes($cfgRelation['user']) . '\', + \'' . PMA_sqlAddSlashes($config_data) . '\')'; } if (isset($_SESSION['cache'][$cache_key]['userprefs'])) { unset($_SESSION['cache'][$cache_key]['userprefs']); diff --git a/pmd_display_field.php b/pmd_display_field.php index 21ef7f2..0e51cd7 100644 --- a/pmd_display_field.php +++ b/pmd_display_field.php @@ -19,21 +19,21 @@ if ($cfgRelation['displaywork']) { if ($disp) { if ($display_field != $disp) { $upd_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_info']) - . ' SET display_field = \'' . PMA_sqlAddslashes($display_field) . '\'' - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''; + . ' SET display_field = \'' . PMA_sqlAddSlashes($display_field) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\''; } else { $upd_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_info']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\''; } } elseif ($display_field != '') { $upd_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_info']) . '(db_name, table_name, display_field) ' . ' VALUES(' - . '\'' . PMA_sqlAddslashes($db) . '\',' - . '\'' . PMA_sqlAddslashes($table) . '\',' - . '\'' . PMA_sqlAddslashes($display_field) . '\')'; + . '\'' . PMA_sqlAddSlashes($db) . '\',' + . '\'' . PMA_sqlAddSlashes($table) . '\',' + . '\'' . PMA_sqlAddSlashes($display_field) . '\')'; } if (isset($upd_query)) { diff --git a/pmd_pdf.php b/pmd_pdf.php index 4972ae2..d697dd5 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -22,7 +22,7 @@ if (isset($mode)) { $pmd_table = PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['designer_coords']); $pma_table = PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']); - $scale_q = PMA_sqlAddslashes($scale); + $scale_q = PMA_sqlAddSlashes($scale); if ('create_export' == $mode) { /* @@ -38,10 +38,10 @@ if (isset($mode)) { } } - $pdf_page_number_q = PMA_sqlAddslashes($pdf_page_number); + $pdf_page_number_q = PMA_sqlAddSlashes($pdf_page_number); if ('export' == $mode) { - $sql = "REPLACE INTO " . $pma_table . " (db_name, table_name, pdf_page_number, x, y) SELECT db_name, table_name, " . $pdf_page_number_q . ", ROUND(x/" . $scale_q . ") , ROUND(y/" . $scale_q . ") y FROM " . $pmd_table . " WHERE db_name = '" . PMA_sqlAddslashes($db) . "'"; + $sql = "REPLACE INTO " . $pma_table . " (db_name, table_name, pdf_page_number, x, y) SELECT db_name, table_name, " . $pdf_page_number_q . ", ROUND(x/" . $scale_q . ") , ROUND(y/" . $scale_q . ") y FROM " . $pmd_table . " WHERE db_name = '" . PMA_sqlAddSlashes($db) . "'"; PMA_query_as_controluser($sql,true,PMA_DBI_QUERY_STORE); } @@ -56,7 +56,7 @@ if (isset($mode)) { AND ' . $pmd_table . '.`table_name` = ' . $pma_table . '.`table_name` AND - ' . $pmd_table . '.`db_name`=\''. PMA_sqlAddslashes($db) .'\' + ' . $pmd_table . '.`db_name`=\''. PMA_sqlAddSlashes($db) .'\' AND pdf_page_number = ' . $pdf_page_number_q . ';', true, PMA_DBI_QUERY_STORE); } } @@ -83,7 +83,7 @@ $choices = array(); $table_info_result = PMA_query_as_controluser('SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''); + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''); if (PMA_DBI_num_rows($table_info_result) > 0) { echo '<p>' . __('Page') . ':'; diff --git a/pmd_relation_new.php b/pmd_relation_new.php index da92e97..a104cc1 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -73,12 +73,12 @@ if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) && $q = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation']) . '(master_db, master_table, master_field, foreign_db, foreign_table, foreign_field)' . ' values(' - . '\'' . PMA_sqlAddslashes($db) . '\', ' - . '\'' . PMA_sqlAddslashes($T2) . '\', ' - . '\'' . PMA_sqlAddslashes($F2) . '\', ' - . '\'' . PMA_sqlAddslashes($db) . '\', ' - . '\'' . PMA_sqlAddslashes($T1) . '\',' - . '\'' . PMA_sqlAddslashes($F1) . '\')'; + . '\'' . PMA_sqlAddSlashes($db) . '\', ' + . '\'' . PMA_sqlAddSlashes($T2) . '\', ' + . '\'' . PMA_sqlAddSlashes($F2) . '\', ' + . '\'' . PMA_sqlAddSlashes($db) . '\', ' + . '\'' . PMA_sqlAddSlashes($T1) . '\',' + . '\'' . PMA_sqlAddSlashes($F1) . '\')'; if (PMA_query_as_controluser($q , false, PMA_DBI_QUERY_STORE)) { PMD_return_new(1, __('Internal relation added')); diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php index 6b4b92b..58c9135 100644 --- a/pmd_relation_upd.php +++ b/pmd_relation_upd.php @@ -44,12 +44,12 @@ if ($try_to_delete_internal_relation) { PMA_query_as_controluser('DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . $cfg['Server']['relation'].' WHERE ' - . 'master_db = \'' . PMA_sqlAddslashes($DB2) . '\'' - . ' AND master_table = \'' . PMA_sqlAddslashes($T2) . '\'' - . ' AND master_field = \'' . PMA_sqlAddslashes($F2) . '\'' - . ' AND foreign_db = \'' . PMA_sqlAddslashes($DB1) . '\'' - . ' AND foreign_table = \'' . PMA_sqlAddslashes($T1) . '\'' - . ' AND foreign_field = \'' . PMA_sqlAddslashes($F1) . '\'' + . 'master_db = \'' . PMA_sqlAddSlashes($DB2) . '\'' + . ' AND master_table = \'' . PMA_sqlAddSlashes($T2) . '\'' + . ' AND master_field = \'' . PMA_sqlAddSlashes($F2) . '\'' + . ' AND foreign_db = \'' . PMA_sqlAddSlashes($DB1) . '\'' + . ' AND foreign_table = \'' . PMA_sqlAddSlashes($T1) . '\'' + . ' AND foreign_field = \'' . PMA_sqlAddSlashes($F1) . '\'' , false, PMA_DBI_QUERY_STORE); } PMD_return_upd(1, __('Relation deleted')); diff --git a/pmd_save_pos.php b/pmd_save_pos.php index fb9d1eb..6fefe63 100644 --- a/pmd_save_pos.php +++ b/pmd_save_pos.php @@ -20,18 +20,18 @@ foreach ($t_x as $key => $value) { $KEY = empty($IS_AJAX) ? urldecode($key) : $key; // table name decode (post PDF exp/imp) list($DB,$TAB) = explode(".", $KEY); PMA_query_as_controluser('DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['designer_coords']) . ' - WHERE `db_name` = \'' . PMA_sqlAddslashes($DB) . '\' - AND `table_name` = \'' . PMA_sqlAddslashes($TAB) . '\'', true, PMA_DBI_QUERY_STORE); + WHERE `db_name` = \'' . PMA_sqlAddSlashes($DB) . '\' + AND `table_name` = \'' . PMA_sqlAddSlashes($TAB) . '\'', true, PMA_DBI_QUERY_STORE); PMA_query_as_controluser('INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['designer_coords']) . ' (db_name, table_name, x, y, v, h) VALUES (' - . '\'' . PMA_sqlAddslashes($DB) . '\', ' - . '\'' . PMA_sqlAddslashes($TAB) . '\', ' - . '\'' . PMA_sqlAddslashes($t_x[$key]) . '\', ' - . '\'' . PMA_sqlAddslashes($t_y[$key]) . '\', ' - . '\'' . PMA_sqlAddslashes($t_v[$key]) . '\', ' - . '\'' . PMA_sqlAddslashes($t_h[$key]) . '\'' + . '\'' . PMA_sqlAddSlashes($DB) . '\', ' + . '\'' . PMA_sqlAddSlashes($TAB) . '\', ' + . '\'' . PMA_sqlAddSlashes($t_x[$key]) . '\', ' + . '\'' . PMA_sqlAddSlashes($t_y[$key]) . '\', ' + . '\'' . PMA_sqlAddSlashes($t_v[$key]) . '\', ' + . '\'' . PMA_sqlAddSlashes($t_h[$key]) . '\'' . ')', true, PMA_DBI_QUERY_STORE); } //---------------------------------------------------------------------------- diff --git a/server_privileges.php b/server_privileges.php index cedbcef..7cd802f 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -166,8 +166,8 @@ function PMA_RangeOfUsers($initial = '') // strtolower() is used because the User field // might be BINARY, so LIKE would be case sensitive if (!empty($initial)) { - $ret = " WHERE `User` LIKE '" . PMA_sqlAddslashes($initial) . "%'" - . " OR `User` LIKE '" . PMA_sqlAddslashes(strtolower($initial)) . "%'"; + $ret = " WHERE `User` LIKE '" . PMA_sqlAddSlashes($initial, true) . "%'" + . " OR `User` LIKE '" . PMA_sqlAddSlashes(strtolower($initial), true) . "%'"; } else { $ret = ''; } @@ -340,23 +340,23 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = true) if ($db == '*') { $sql_query = "SELECT * FROM `mysql`.`user`" - ." WHERE `User` = '" . PMA_sqlAddslashes($username) . "'" - ." AND `Host` = '" . PMA_sqlAddslashes($hostname) . "';"; + ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'" + ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "';"; } elseif ($table == '*') { $sql_query = "SELECT * FROM `mysql`.`db`" - ." WHERE `User` = '" . PMA_sqlAddslashes($username) . "'" - ." AND `Host` = '" . PMA_sqlAddslashes($hostname) . "'" + ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'" + ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "'" ." AND '" . PMA_unescape_mysql_wildcards($db) . "'" ." LIKE `Db`;"; } else { $sql_query = "SELECT `Table_priv`" ." FROM `mysql`.`tables_priv`" - ." WHERE `User` = '" . PMA_sqlAddslashes($username) . "'" - ." AND `Host` = '" . PMA_sqlAddslashes($hostname) . "'" + ." WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'" + ." AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "'" ." AND `Db` = '" . PMA_unescape_mysql_wildcards($db) . "'" - ." AND `Table_name` = '" . PMA_sqlAddslashes($table) . "';"; + ." AND `Table_name` = '" . PMA_sqlAddSlashes($table) . "';"; } $row = PMA_DBI_fetch_single_row($sql_query); } @@ -420,13 +420,13 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = true) 'SELECT `Column_name`, `Column_priv`' .' FROM `mysql`.`columns_priv`' .' WHERE `User`' - .' = \'' . PMA_sqlAddslashes($username) . "'" + .' = \'' . PMA_sqlAddSlashes($username) . "'" .' AND `Host`' - .' = \'' . PMA_sqlAddslashes($hostname) . "'" + .' = \'' . PMA_sqlAddSlashes($hostname) . "'" .' AND `Db`' - .' = \'' . PMA_sqlAddslashes(PMA_unescape_mysql_wildcards($db)) . "'" + .' = \'' . PMA_sqlAddSlashes(PMA_unescape_mysql_wildcards($db)) . "'" .' AND `Table_name`' - .' = \'' . PMA_sqlAddslashes($table) . '\';'); + .' = \'' . PMA_sqlAddSlashes($table) . '\';'); while ($row1 = PMA_DBI_fetch_row($res)) { $row1[1] = explode(',', $row1[1]); @@ -809,9 +809,9 @@ function PMA_displayLoginInformationFields($mode = 'new') if (isset($_REQUEST['change_copy'])) { $user_host_condition = ' WHERE `User`' - .' = \'' . PMA_sqlAddslashes($old_username) . "'" + .' = \'' . PMA_sqlAddSlashes($old_username) . "'" .' AND `Host`' - .' = \'' . PMA_sqlAddslashes($old_hostname) . '\';'; + .' = \'' . PMA_sqlAddSlashes($old_hostname) . '\';'; $row = PMA_DBI_fetch_single_row('SELECT * FROM `mysql`.`user` ' . $user_host_condition); if (! $row) { PMA_Message::notice(__('No user found.'))->display(); @@ -855,8 +855,8 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { break; } $sql = "SELECT '1' FROM `mysql`.`user`" - . " WHERE `User` = '" . PMA_sqlAddslashes($username) . "'" - . " AND `Host` = '" . PMA_sqlAddslashes($hostname) . "';"; + . " WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'" + . " AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "';"; if (PMA_DBI_fetch_value($sql) == 1) { $message = PMA_Message::error(__('The user %s already exists!')); $message->addParam('[i]\'' . $username . '\'@\'' . $hostname . '\'[/i]'); @@ -864,17 +864,17 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { $_add_user_error = true; } else { - $create_user_real = 'CREATE USER \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\''; + $create_user_real = 'CREATE USER \'' . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\''; $real_sql_query = 'GRANT ' . join(', ', PMA_extractPrivInfo()) . ' ON *.* TO \'' - . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\''; + . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\''; if ($pred_password != 'none' && $pred_password != 'keep') { $sql_query = $real_sql_query . ' IDENTIFIED BY \'***\''; - $real_sql_query .= ' IDENTIFIED BY \'' . PMA_sqlAddslashes($pma_pw) . '\''; + $real_sql_query .= ' IDENTIFIED BY \'' . PMA_sqlAddSlashes($pma_pw) . '\''; if (isset($create_user_real)) { $create_user_show = $create_user_real . ' IDENTIFIED BY \'***\''; - $create_user_real .= ' IDENTIFIED BY \'' . PMA_sqlAddslashes($pma_pw) . '\''; + $create_user_real .= ' IDENTIFIED BY \'' . PMA_sqlAddSlashes($pma_pw) . '\''; } } else { if ($pred_password == 'keep' && !empty($password)) { @@ -949,7 +949,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { case '1' : // Create database with same name and grant all privileges $q = 'CREATE DATABASE IF NOT EXISTS ' - . PMA_backquote(PMA_sqlAddslashes($username)) . ';'; + . PMA_backquote(PMA_sqlAddSlashes($username)) . ';'; $sql_query .= $q; if (! PMA_DBI_try_query($q)) { $message = PMA_Message::rawError(PMA_DBI_getError()); @@ -968,8 +968,8 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { } $q = 'GRANT ALL PRIVILEGES ON ' - . PMA_backquote(PMA_sqlAddslashes($username)) . '.* TO \'' - . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\';'; + . PMA_backquote(PMA_sqlAddSlashes($username)) . '.* TO \'' + . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\';'; $sql_query .= $q; if (! PMA_DBI_try_query($q)) { $message = PMA_Message::rawError(PMA_DBI_getError()); @@ -978,8 +978,8 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { case '2' : // Grant all privileges on wildcard name (username\_%) $q = 'GRANT ALL PRIVILEGES ON ' - . PMA_backquote(PMA_sqlAddslashes($username) . '\_%') . '.* TO \'' - . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\';'; + . PMA_backquote(PMA_sqlAddSlashes($username) . '\_%') . '.* TO \'' + . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\';'; $sql_query .= $q; if (! PMA_DBI_try_query($q)) { $message = PMA_Message::rawError(PMA_DBI_getError()); @@ -988,8 +988,8 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { case '3' : // Grant all privileges on the specified database to the new user $q = 'GRANT ALL PRIVILEGES ON ' - . PMA_backquote(PMA_sqlAddslashes($dbname)) . '.* TO \'' - . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\';'; + . PMA_backquote(PMA_sqlAddSlashes($dbname)) . '.* TO \'' + . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\';'; $sql_query .= $q; if (! PMA_DBI_try_query($q)) { $message = PMA_Message::rawError(PMA_DBI_getError()); @@ -1024,15 +1024,15 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { if (isset($_REQUEST['change_copy'])) { $user_host_condition = ' WHERE `User`' - .' = \'' . PMA_sqlAddslashes($old_username) . "'" + .' = \'' . PMA_sqlAddSlashes($old_username) . "'" .' AND `Host`' - .' = \'' . PMA_sqlAddslashes($old_hostname) . '\';'; + .' = \'' . PMA_sqlAddSlashes($old_hostname) . '\';'; $res = PMA_DBI_query('SELECT * FROM `mysql`.`db`' . $user_host_condition); while ($row = PMA_DBI_fetch_assoc($res)) { $queries[] = 'GRANT ' . join(', ', PMA_extractPrivInfo($row)) .' ON ' . PMA_backquote($row['Db']) . '.*' - .' TO \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\'' + .' TO \'' . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\'' . ($row['Grant_priv'] == 'Y' ? ' WITH GRANT OPTION;' : ';'); } PMA_DBI_free_result($res); @@ -1046,13 +1046,13 @@ if (isset($_REQUEST['change_copy'])) { 'SELECT `Column_name`, `Column_priv`' .' FROM `mysql`.`columns_priv`' .' WHERE `User`' - .' = \'' . PMA_sqlAddslashes($old_username) . "'" + .' = \'' . PMA_sqlAddSlashes($old_username) . "'" .' AND `Host`' - .' = \'' . PMA_sqlAddslashes($old_hostname) . '\'' + .' = \'' . PMA_sqlAddSlashes($old_hostname) . '\'' .' AND `Db`' - .' = \'' . PMA_sqlAddslashes($row['Db']) . "'" + .' = \'' . PMA_sqlAddSlashes($row['Db']) . "'" .' AND `Table_name`' - .' = \'' . PMA_sqlAddslashes($row['Table_name']) . "'" + .' = \'' . PMA_sqlAddSlashes($row['Table_name']) . "'" .';', null, PMA_DBI_QUERY_STORE); @@ -1096,7 +1096,7 @@ if (isset($_REQUEST['change_copy'])) { $queries[] = 'GRANT ' . join(', ', $tmp_privs1) . ' ON ' . PMA_backquote($row['Db']) . '.' . PMA_backquote($row['Table_name']) - . ' TO \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\'' + . ' TO \'' . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\'' . (in_array('Grant', explode(',', $row['Table_priv'])) ? ' WITH GRANT OPTION;' : ';'); } } @@ -1110,11 +1110,11 @@ if (!empty($update_privs)) { $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table - . ' FROM \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\';'; + . ' FROM \'' . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\';'; if (! isset($Grant_priv) || $Grant_priv != 'Y') { $sql_query1 = 'REVOKE GRANT OPTION ON ' . $db_and_table - . ' FROM \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\';'; + . ' FROM \'' . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\';'; } else { $sql_query1 = ''; } @@ -1125,7 +1125,7 @@ if (!empty($update_privs)) { $sql_query2 = 'GRANT ' . join(', ', PMA_extractPrivInfo()) . ' ON ' . $db_and_table - . ' TO \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\''; + . ' TO \'' . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\''; /** * @todo similar code appears twice in this script @@ -1186,10 +1186,10 @@ if (isset($_REQUEST['revokeall'])) { $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table - . ' FROM \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\';'; + . ' FROM \'' . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\';'; $sql_query1 = 'REVOKE GRANT OPTION ON ' . $db_and_table - . ' FROM \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\';'; + . ' FROM \'' . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\';'; PMA_DBI_query($sql_query0); if (! PMA_DBI_try_query($sql_query1)) { @@ -1229,8 +1229,8 @@ if (isset($_REQUEST['change_pw'])) { . 'PASSWORD'; // in $sql_query which will be displayed, hide the password - $sql_query = 'SET PASSWORD FOR \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\' = ' . (($pma_pw == '') ? '\'\'' : $hashing_function . '(\'' . preg_replace('@.@s', '*', $pma_pw) . '\')'); - $local_query = 'SET PASSWORD FOR \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\' = ' . (($pma_pw == '') ? '\'\'' : $hashing_function . '(\'' . PMA_sqlAddslashes($pma_pw) . '\')'); + $sql_query = 'SET PASSWORD FOR \'' . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\' = ' . (($pma_pw == '') ? '\'\'' : $hashing_function . '(\'' . preg_replace('@.@s', '*', $pma_pw) . '\')'); + $local_query = 'SET PASSWORD FOR \'' . PMA_sqlAddSlashes($username) . '\'@\'' . PMA_sqlAddSlashes($hostname) . '\' = ' . (($pma_pw == '') ? '\'\'' : $hashing_function . '(\'' . PMA_sqlAddSlashes($pma_pw) . '\')'); PMA_DBI_try_query($local_query) or PMA_mysqlDie(PMA_DBI_getError(), $sql_query, false, $err_url); $message = PMA_Message::success(__('The password for %s was changed successfully.')); @@ -1254,7 +1254,7 @@ if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST[ foreach ($selected_usr as $each_user) { list($this_user, $this_host) = explode('&#27;', $each_user); $queries[] = '# ' . sprintf(__('Deleting %s'), '\'' . $this_user . '\'@\'' . $this_host . '\'') . ' ...'; - $queries[] = 'DROP USER \'' . PMA_sqlAddslashes($this_user) . '\'@\'' . PMA_sqlAddslashes($this_host) . '\';'; + $queries[] = 'DROP USER \'' . PMA_sqlAddSlashes($this_user) . '\'@\'' . PMA_sqlAddSlashes($this_host) . '\';'; if (isset($_REQUEST['drop_users_db'])) { $queries[] = 'DROP DATABASE IF EXISTS ' . PMA_backquote($this_user) . ';'; @@ -1451,7 +1451,7 @@ if (isset($viewing_mode) && $viewing_mode == 'db') { if (isset($_REQUEST['export'])) { echo '<h2>' . __('User') . ' \'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'</h2>'; echo '<textarea cols="' . $GLOBALS['cfg']['TextareaCols'] . '" rows="' . $GLOBALS['cfg']['TextareaRows'] . '">'; - $grants = PMA_DBI_fetch_result("SHOW GRANTS FOR '" . PMA_sqlAddslashes($username) . "'@'" . PMA_sqlAddslashes($hostname) . "'"); + $grants = PMA_DBI_fetch_result("SHOW GRANTS FOR '" . PMA_sqlAddSlashes($username) . "'@'" . PMA_sqlAddSlashes($hostname) . "'"); foreach($grants as $one_grant) { echo $one_grant . ";\n\n"; } @@ -1756,8 +1756,8 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $sql = "SELECT '1' FROM `mysql`.`user`" - . " WHERE `User` = '" . PMA_sqlAddslashes($username) . "'" - . " AND `Host` = '" . PMA_sqlAddslashes($hostname) . "';"; + . " WHERE `User` = '" . PMA_sqlAddSlashes($username) . "'" + . " AND `Host` = '" . PMA_sqlAddSlashes($hostname) . "';"; $user_does_not_exists = (bool) ! PMA_DBI_fetch_value($sql); unset($sql); if ($user_does_not_exists) { @@ -1809,9 +1809,9 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $user_host_condition = ' WHERE `User`' - . ' = \'' . PMA_sqlAddslashes($username) . "'" + . ' = \'' . PMA_sqlAddSlashes($username) . "'" . ' AND `Host`' - . ' = \'' . PMA_sqlAddslashes($hostname) . "'"; + . ' = \'' . PMA_sqlAddSlashes($hostname) . "'"; // table body // get data @@ -1888,7 +1888,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $user_host_condition .= ' AND `Db`' - .' LIKE \'' . PMA_sqlAddslashes($dbname) . "'"; + .' LIKE \'' . PMA_sqlAddSlashes($dbname, true) . "'"; $tables_to_search_for_users = array( 'columns_priv', @@ -2209,7 +2209,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $sql_query = '(SELECT ' . $list_of_privileges . ', `Db`' .' FROM `mysql`.`db`' - .' WHERE \'' . PMA_sqlAddslashes($checkprivs) . "'" + .' WHERE \'' . PMA_sqlAddSlashes($checkprivs) . "'" .' LIKE `Db`' .' AND NOT (' . $list_of_compared_privileges. ')) ' .'UNION ' diff --git a/server_replication.php b/server_replication.php index 511af06..5576914 100644 --- a/server_replication.php +++ b/server_replication.php @@ -40,10 +40,10 @@ if (! $is_superuser) { if (isset($GLOBALS['sr_take_action'])) { $refresh = false; if (isset($GLOBALS['slave_changemaster'])) { - $_SESSION['replication']['m_username'] = $sr['username'] = PMA_sqlAddslashes($GLOBALS['username']); - $_SESSION['replication']['m_password'] = $sr['pma_pw'] = PMA_sqlAddslashes($GLOBALS['pma_pw']); - $_SESSION['replication']['m_hostname'] = $sr['hostname'] = PMA_sqlAddslashes($GLOBALS['hostname']); - $_SESSION['replication']['m_port'] = $sr['port'] = PMA_sqlAddslashes($GLOBALS['port']); + $_SESSION['replication']['m_username'] = $sr['username'] = PMA_sqlAddSlashes($GLOBALS['username']); + $_SESSION['replication']['m_password'] = $sr['pma_pw'] = PMA_sqlAddSlashes($GLOBALS['pma_pw']); + $_SESSION['replication']['m_hostname'] = $sr['hostname'] = PMA_sqlAddSlashes($GLOBALS['hostname']); + $_SESSION['replication']['m_port'] = $sr['port'] = PMA_sqlAddSlashes($GLOBALS['port']); $_SESSION['replication']['m_correct'] = ''; $_SESSION['replication']['sr_action_status'] = 'error'; $_SESSION['replication']['sr_action_info'] = __('Unknown error'); diff --git a/sql.php b/sql.php index 7da775a..10985b6 100644 --- a/sql.php +++ b/sql.php @@ -175,7 +175,7 @@ if(isset($_REQUEST['set_col_order']) && $_REQUEST['set_col_order'] == true) { // (needed for browsing from DefaultTabTable) if (empty($sql_query) && strlen($table) && strlen($db)) { require_once './libraries/bookmark.lib.php'; - $book_sql_query = PMA_Bookmark_get($db, '\'' . PMA_sqlAddslashes($table) . '\'', + $book_sql_query = PMA_Bookmark_get($db, '\'' . PMA_sqlAddSlashes($table) . '\'', 'label', false, true); if (! empty($book_sql_query)) { diff --git a/tbl_alter.php b/tbl_alter.php index 743e925..316c48e 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -170,7 +170,7 @@ if ($abort == false) { * @todo optimize in case of multiple fields to modify */ for ($i = 0; $i < $selected_cnt; $i++) { - $_REQUEST['field'] = PMA_sqlAddslashes($selected[$i], true); + $_REQUEST['field'] = PMA_sqlAddSlashes($selected[$i], true); $result = PMA_DRIZZLE ? PMA_DBI_query('SHOW COLUMNS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db) . ' WHERE Field = \'' . $_REQUEST['field'] . '\';') : PMA_DBI_query('SHOW FULL COLUMNS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db) . ' LIKE \'' . $_REQUEST['field'] . '\';'); diff --git a/tbl_create.php b/tbl_create.php index b141fc1..e3e743b 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -184,10 +184,10 @@ if (isset($_REQUEST['do_save_data'])) { $sql_query .= PMA_generateCharsetQueryPart($_REQUEST['tbl_collation']); } if (!empty($_REQUEST['comment'])) { - $sql_query .= ' COMMENT = \'' . PMA_sqlAddslashes($_REQUEST['comment']) . '\''; + $sql_query .= ' COMMENT = \'' . PMA_sqlAddSlashes($_REQUEST['comment']) . '\''; } if (!empty($_REQUEST['partition_definition'])) { - $sql_query .= ' ' . PMA_sqlAddslashes($_REQUEST['partition_definition']); + $sql_query .= ' ' . PMA_sqlAddSlashes($_REQUEST['partition_definition']); } $sql_query .= ';'; @@ -231,7 +231,7 @@ if (isset($_REQUEST['do_save_data'])) { $is_show_stats = $cfg['ShowStats']; $tbl_stats_result = PMA_DBI_query('SHOW TABLE STATUS FROM ' - . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddSlashes($table) . '\';'); + . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddSlashes($table, true) . '\';'); $tbl_stats = PMA_DBI_fetch_assoc($tbl_stats_result); PMA_DBI_free_result($tbl_stats_result); unset($tbl_stats_result); diff --git a/tbl_operations.php b/tbl_operations.php index 8b49259..2205a4f 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -102,7 +102,7 @@ if (isset($_REQUEST['submitoptions'])) { } if (isset($_REQUEST['comment']) && urldecode($_REQUEST['prev_comment']) !== $_REQUEST['comment']) { - $table_alters[] = 'COMMENT = \'' . PMA_sqlAddslashes($_REQUEST['comment']) . '\''; + $table_alters[] = 'COMMENT = \'' . PMA_sqlAddSlashes($_REQUEST['comment']) . '\''; } if (! empty($_REQUEST['new_tbl_type']) && strtolower($_REQUEST['new_tbl_type']) !== strtolower($tbl_type)) { @@ -156,13 +156,13 @@ if (isset($_REQUEST['submitoptions'])) { if (($is_myisam_or_aria || $is_innodb || $is_pbxt) && ! empty($_REQUEST['new_auto_increment']) && (! isset($auto_increment) || $_REQUEST['new_auto_increment'] !== $auto_increment)) { - $table_alters[] = 'auto_increment = ' . PMA_sqlAddslashes($_REQUEST['new_auto_increment']); + $table_alters[] = 'auto_increment = ' . PMA_sqlAddSlashes($_REQUEST['new_auto_increment']); } if (($is_myisam_or_aria || $is_innodb || $is_pbxt) && ! empty($_REQUEST['new_row_format']) && (! isset($row_format) || strtolower($_REQUEST['new_row_format']) !== strtolower($row_format))) { - $table_alters[] = 'ROW_FORMAT = ' . PMA_sqlAddslashes($_REQUEST['new_row_format']); + $table_alters[] = 'ROW_FORMAT = ' . PMA_sqlAddSlashes($_REQUEST['new_row_format']); } if (count($table_alters) > 0) { diff --git a/tbl_relation.php b/tbl_relation.php index 6d82cc3..e3f4338 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -143,26 +143,26 @@ if (isset($destination) && $cfgRelation['relwork']) { $upd_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation']) . '(master_db, master_table, master_field, foreign_db, foreign_table, foreign_field)' . ' values(' - . '\'' . PMA_sqlAddslashes($db) . '\', ' - . '\'' . PMA_sqlAddslashes($table) . '\', ' - . '\'' . PMA_sqlAddslashes($master_field) . '\', ' - . '\'' . PMA_sqlAddslashes($foreign_db) . '\', ' - . '\'' . PMA_sqlAddslashes($foreign_table) . '\',' - . '\'' . PMA_sqlAddslashes($foreign_field) . '\')'; + . '\'' . PMA_sqlAddSlashes($db) . '\', ' + . '\'' . PMA_sqlAddSlashes($table) . '\', ' + . '\'' . PMA_sqlAddSlashes($master_field) . '\', ' + . '\'' . PMA_sqlAddSlashes($foreign_db) . '\', ' + . '\'' . PMA_sqlAddSlashes($foreign_table) . '\',' + . '\'' . PMA_sqlAddSlashes($foreign_field) . '\')'; } elseif ($existrel[$master_field]['foreign_db'] . '.' .$existrel[$master_field]['foreign_table'] . '.' . $existrel[$master_field]['foreign_field'] != $foreign_string) { $upd_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation']) . ' SET' - . ' foreign_db = \'' . PMA_sqlAddslashes($foreign_db) . '\', ' - . ' foreign_table = \'' . PMA_sqlAddslashes($foreign_table) . '\', ' - . ' foreign_field = \'' . PMA_sqlAddslashes($foreign_field) . '\' ' - . ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND master_table = \'' . PMA_sqlAddslashes($table) . '\'' - . ' AND master_field = \'' . PMA_sqlAddslashes($master_field) . '\''; + . ' foreign_db = \'' . PMA_sqlAddSlashes($foreign_db) . '\', ' + . ' foreign_table = \'' . PMA_sqlAddSlashes($foreign_table) . '\', ' + . ' foreign_field = \'' . PMA_sqlAddSlashes($foreign_field) . '\' ' + . ' WHERE master_db = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND master_table = \'' . PMA_sqlAddSlashes($table) . '\'' + . ' AND master_field = \'' . PMA_sqlAddSlashes($master_field) . '\''; } // end if... else.... } elseif (isset($existrel[$master_field])) { $upd_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation']) - . ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND master_table = \'' . PMA_sqlAddslashes($table) . '\'' - . ' AND master_field = \'' . PMA_sqlAddslashes($master_field) . '\''; + . ' WHERE master_db = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND master_table = \'' . PMA_sqlAddSlashes($table) . '\'' + . ' AND master_field = \'' . PMA_sqlAddSlashes($master_field) . '\''; } // end if... else.... if ($upd_query) { PMA_query_as_controluser($upd_query); @@ -299,21 +299,21 @@ if ($cfgRelation['displaywork'] && isset($display_field)) { if ($disp) { if ($display_field != '') { $upd_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_info']) - . ' SET display_field = \'' . PMA_sqlAddslashes($display_field) . '\'' - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''; + . ' SET display_field = \'' . PMA_sqlAddSlashes($display_field) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\''; } else { $upd_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_info']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\''; } } elseif ($display_field != '') { $upd_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_info']) . '(db_name, table_name, display_field) ' . ' VALUES(' - . '\'' . PMA_sqlAddslashes($db) . '\',' - . '\'' . PMA_sqlAddslashes($table) . '\',' - . '\'' . PMA_sqlAddslashes($display_field) . '\')'; + . '\'' . PMA_sqlAddSlashes($db) . '\',' + . '\'' . PMA_sqlAddSlashes($table) . '\',' + . '\'' . PMA_sqlAddSlashes($display_field) . '\')'; } if ($upd_query) { diff --git a/tbl_replace.php b/tbl_replace.php index 2876b50..b0c71e6 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -218,7 +218,7 @@ foreach ($loop_array as $rownumber => $where_clause) { // if the most recent BLOB reference exists, set it as a field value if (!is_null($bs_reference)) { - $val = "'" . PMA_sqlAddslashes($bs_reference) . "'"; + $val = "'" . PMA_sqlAddSlashes($bs_reference) . "'"; } } } @@ -256,7 +256,7 @@ foreach ($loop_array as $rownumber => $where_clause) { $query_values[] = PMA_backquote($me_fields_name[$key]) . ' = ' . $cur_value; } elseif (empty($me_funcs[$key]) && isset($me_fields_prev[$key]) - && ("'" . PMA_sqlAddslashes($me_fields_prev[$key]) . "'" == $val)) { + && ("'" . PMA_sqlAddSlashes($me_fields_prev[$key]) . "'" == $val)) { // No change for this column and no MySQL function is used -> next column continue; } elseif (! empty($val)) { diff --git a/tbl_select.php b/tbl_select.php index 875182d..33b7e48 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -355,9 +355,9 @@ else { $parens_open = ''; $parens_close = ''; } - $enum_where = '\'' . PMA_sqlAddslashes($fields[$i][0]) . '\''; + $enum_where = '\'' . PMA_sqlAddSlashes($fields[$i][0]) . '\''; for ($e = 1; $e < $enum_selected_count; $e++) { - $enum_where .= ', \'' . PMA_sqlAddslashes($fields[$i][$e]) . '\''; + $enum_where .= ', \'' . PMA_sqlAddSlashes($fields[$i][$e]) . '\''; } $w[] = PMA_backquote($names[$i]) . ' ' . $func_type . ' ' . $parens_open . $enum_where . $parens_close; @@ -389,7 +389,7 @@ else { // quote values one by one $values = explode(',', $fields[$i]); foreach ($values as &$value) - $value = $quot . PMA_sqlAddslashes(trim($value)) . $quot; + $value = $quot . PMA_sqlAddSlashes(trim($value)) . $quot; if ($func_type == 'BETWEEN' || $func_type == 'NOT BETWEEN') $w[] = PMA_backquote($names[$i]) . ' ' . $func_type . ' ' . (isset($values[0]) ? $values[0] : '') . ' AND ' . (isset($values[1]) ? $values[1] : ''); @@ -397,7 +397,7 @@ else { $w[] = PMA_backquote($names[$i]) . ' ' . $func_type . ' (' . implode(',', $values) . ')'; } else { - $w[] = PMA_backquote($names[$i]) . ' ' . $func_type . ' ' . $quot . PMA_sqlAddslashes($fields[$i]) . $quot;; + $w[] = PMA_backquote($names[$i]) . ' ' . $func_type . ' ' . $quot . PMA_sqlAddSlashes($fields[$i]) . $quot;; } } // end if diff --git a/tbl_tracking.php b/tbl_tracking.php index a708f0a..b612885 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -584,7 +584,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { $sql_query = " SELECT DISTINCT db_name, table_name FROM " . PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . "." . PMA_backquote($GLOBALS['cfg']['Server']['tracking']) . - " WHERE " . PMA_backquote('db_name') . " = '" . PMA_sqlAddslashes($GLOBALS['db']) . "' " . + " WHERE " . PMA_backquote('db_name') . " = '" . PMA_sqlAddSlashes($GLOBALS['db']) . "' " . " ORDER BY ". PMA_backquote('db_name') . ", " . PMA_backquote('table_name'); $sql_result = PMA_query_as_controluser($sql_query); @@ -624,8 +624,8 @@ if (PMA_DBI_num_rows($sql_result) > 0) { $sql_query = " SELECT * FROM " . PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . "." . PMA_backquote($GLOBALS['cfg']['Server']['tracking']) . - " WHERE " . PMA_backquote('db_name') . " = '" . PMA_sqlAddslashes($_REQUEST['db']) . "' ". - " AND " . PMA_backquote('table_name') . " = '" . PMA_sqlAddslashes($_REQUEST['table']) ."' ". + " WHERE " . PMA_backquote('db_name') . " = '" . PMA_sqlAddSlashes($_REQUEST['db']) . "' ". + " AND " . PMA_backquote('table_name') . " = '" . PMA_sqlAddSlashes($_REQUEST['table']) ."' ". " ORDER BY ". PMA_backquote('version') . " DESC "; $sql_result = PMA_query_as_controluser($sql_query); diff --git a/test/PMA_quoting_slashing_test.php b/test/PMA_quoting_slashing_test.php index f801025..c918390 100644 --- a/test/PMA_quoting_slashing_test.php +++ b/test/PMA_quoting_slashing_test.php @@ -31,14 +31,14 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase public function testAddSlashes() { $string = "\'test''\''\'\r\t\n"; - $this->assertEquals("\\\\\\\\\'test\'\'\\\\\\\\\'\'\\\\\\\\\'\\r\\t\\n", PMA_sqlAddslashes($string, true, true, true)); - $this->assertEquals("\\\\\\\\''test''''\\\\\\\\''''\\\\\\\\''\\r\\t\\n", PMA_sqlAddslashes($string, true, true, false)); - $this->assertEquals("\\\\\\\\\'test\'\'\\\\\\\\\'\'\\\\\\\\\'\r\t\n", PMA_sqlAddslashes($string, true, false, true)); - $this->assertEquals("\\\\\\\\''test''''\\\\\\\\''''\\\\\\\\''\r\t\n", PMA_sqlAddslashes($string, true, false, false)); - $this->assertEquals("\\\\\'test\'\'\\\\\'\'\\\\\'\\r\\t\\n", PMA_sqlAddslashes($string, false, true, true)); - $this->assertEquals("\\\\''test''''\\\\''''\\\\''\\r\\t\\n", PMA_sqlAddslashes($string, false, true, false)); - $this->assertEquals("\\\\\'test\'\'\\\\\'\'\\\\\'\r\t\n", PMA_sqlAddslashes($string, false, false, true)); - $this->assertEquals("\\\\''test''''\\\\''''\\\\''\r\t\n", PMA_sqlAddslashes($string, false, false, false)); + $this->assertEquals("\\\\\\\\\'test\'\'\\\\\\\\\'\'\\\\\\\\\'\\r\\t\\n", PMA_sqlAddSlashes($string, true, true, true)); + $this->assertEquals("\\\\\\\\''test''''\\\\\\\\''''\\\\\\\\''\\r\\t\\n", PMA_sqlAddSlashes($string, true, true, false)); + $this->assertEquals("\\\\\\\\\'test\'\'\\\\\\\\\'\'\\\\\\\\\'\r\t\n", PMA_sqlAddSlashes($string, true, false, true)); + $this->assertEquals("\\\\\\\\''test''''\\\\\\\\''''\\\\\\\\''\r\t\n", PMA_sqlAddSlashes($string, true, false, false)); + $this->assertEquals("\\\\\'test\'\'\\\\\'\'\\\\\'\\r\\t\\n", PMA_sqlAddSlashes($string, false, true, true)); + $this->assertEquals("\\\\''test''''\\\\''''\\\\''\\r\\t\\n", PMA_sqlAddSlashes($string, false, true, false)); + $this->assertEquals("\\\\\'test\'\'\\\\\'\'\\\\\'\r\t\n", PMA_sqlAddSlashes($string, false, false, true)); + $this->assertEquals("\\\\''test''''\\\\''''\\\\''\r\t\n", PMA_sqlAddSlashes($string, false, false, false)); } /** diff --git a/user_password.php b/user_password.php index a8ff8da..a4eeffe 100644 --- a/user_password.php +++ b/user_password.php @@ -76,7 +76,7 @@ if (isset($_REQUEST['nopass'])) { } $sql_query = 'SET password = ' . (($password == '') ? '\'\'' : $hashing_function . '(\'***\')'); - $local_query = 'SET password = ' . (($password == '') ? '\'\'' : $hashing_function . '(\'' . PMA_sqlAddslashes($password) . '\')'); + $local_query = 'SET password = ' . (($password == '') ? '\'\'' : $hashing_function . '(\'' . PMA_sqlAddSlashes($password) . '\')'); $result = @PMA_DBI_try_query($local_query) or PMA_mysqlDie(PMA_DBI_getError(), $sql_query, false, $err_url); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6299-g6a422ca
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, master has been updated via 6a422caf527226740155c7e3682f2f3c61a85696 (commit) from 44fd261fa64da13bfe363ea01cb79219849aee10 (commit) - Log ----------------------------------------------------------------- commit 6a422caf527226740155c7e3682f2f3c61a85696 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 14:46:04 2011 +0200 Proper escaping while checking for table (bug#3323066) ----------------------------------------------------------------------- Summary of changes: libraries/database_interface.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 2625fe9..d9f19f3 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -383,7 +383,7 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals if ($table || (true === $tbl_is_group)) { $sql = 'SHOW TABLE STATUS FROM ' . PMA_backquote($each_database) - .' LIKE \'' . PMA_escape_mysql_wildcards(PMA_sqlAddSlashes($table)) . '%\''; + .' LIKE \'' . PMA_escape_mysql_wildcards(PMA_sqlAddSlashes($table, true)) . '%\''; } else { $sql = 'SHOW TABLE STATUS FROM ' . PMA_backquote($each_database); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6298-g44fd261
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, master has been updated via 44fd261fa64da13bfe363ea01cb79219849aee10 (commit) via 78ee628312d43ccb6cb3a2f95ae98ade2eef478c (commit) from 5e05e80086c8621ce0abf8442005d2f44b93b0e3 (commit) - Log ----------------------------------------------------------------- commit 44fd261fa64da13bfe363ea01cb79219849aee10 Merge: 78ee628312d43ccb6cb3a2f95ae98ade2eef478c 5e05e80086c8621ce0abf8442005d2f44b93b0e3 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 14:36:09 2011 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 78ee628312d43ccb6cb3a2f95ae98ade2eef478c Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 14:34:06 2011 +0200 Use cache to skip blobstreaming check if server does not support it ----------------------------------------------------------------------- Summary of changes: libraries/blobstreaming.lib.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php index fc5265b..c7250dc 100644 --- a/libraries/blobstreaming.lib.php +++ b/libraries/blobstreaming.lib.php @@ -47,6 +47,10 @@ function initPBMSDatabase() */ function checkBLOBStreamingPlugins() { + if (PMA_cacheGet('skip_blobstreaming', true) === true) { + return false; + } + // load PMA configuration $PMA_Config = $GLOBALS['PMA_Config']; hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git June 2011