From a5839bf23649f8c927d02d9d09b977e7fbbc70c3 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 8 Jun 2013 08:38:12 -0400 Subject: [PATCH 1/4] Start to fix bug #3921 --- libraries/Menu.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php index 9b5fdf3792..e6674b929b 100644 --- a/libraries/Menu.class.php +++ b/libraries/Menu.class.php @@ -427,7 +427,7 @@ class PMA_Menu */ private function _getServerTabs() { - $is_superuser = PMA_isSuperuser(); + $is_superuser = function_exists('PMA_isSuperuser') && PMA_isSuperuser(); $binary_logs = null; if (!defined('PMA_DRIZZLE') || (defined('PMA_DRIZZLE') && ! PMA_DRIZZLE)) { $binary_logs = PMA_DBI_fetch_result( From 50e01992067b2401310688da027a10ee652fd61d Mon Sep 17 00:00:00 2001 From: Pl P Date: Fri, 7 Jun 2013 23:46:48 +0200 Subject: [PATCH 2/4] Translated using Weblate (Bulgarian) Currently translated at 76.8% (1998 of 2603) --- po/bg.po | 48 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/po/bg.po b/po/bg.po index 1eb55d7bb4..ece74086c7 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,14 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-06-03 09:16-0400\n" -"PO-Revision-Date: 2013-05-27 18:09+0200\n" +"PO-Revision-Date: 2013-06-07 23:46+0200\n" "Last-Translator: Pl P \n" -"Language-Team: Bulgarian \n" +"Language-Team: Bulgarian \n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bg\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 1.6-dev\n" @@ -1956,7 +1955,7 @@ msgid "" "A newer version of phpMyAdmin is available and you should consider " "upgrading. The newest version is %s, released on %s." msgstr "" -"Налична е нова всесия на phpMyAdmin и трябва да обмислите обневление. Новата " +"Налична е нова версия на phpMyAdmin и трябва да обмислите обновяване. Новата " "версия е %s, излязла на %s." #. l10n: Latest available phpMyAdmin version @@ -7812,7 +7811,7 @@ msgstr "" #: libraries/plugins/export/ExportSql.class.php:305 msgid "Instead of INSERT statements, use:" -msgstr "" +msgstr "Вместо INSERT изрази, да се използват:" #: libraries/plugins/export/ExportSql.class.php:311 msgid "INSERT DELAYED statements" @@ -7837,6 +7836,9 @@ msgid "" "    Example: INSERT INTO tbl_name (col_A,col_B,col_C) VALUES " "(1,2,3)" msgstr "" +"включване на имената на полетата във всеки INSERT израз
" +"      Пример: INSERT INTO tbl_name (col_A,col_B,col_C) " +"VALUES (1,2,3)" #: libraries/plugins/export/ExportSql.class.php:361 msgid "" @@ -7844,30 +7846,43 @@ msgid "" "    Example: INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), " "(7,8,9)" msgstr "" +"включване на няколко реда във всеки INSERT израз
  " +"    Пример: INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), " +"(7,8,9)" #: libraries/plugins/export/ExportSql.class.php:366 msgid "" "both of the above
      Example: INSERT INTO " "tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)" msgstr "" +"комбинация от двата горни варианта
      Пример: " +"INSERT INTO tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), " +"(7,8,9)" #: libraries/plugins/export/ExportSql.class.php:371 msgid "" "neither of the above
      Example: INSERT INTO " "tbl_name VALUES (1,2,3)" msgstr "" +"нито един от горните варианти
      Пример: " +"INSERT INTO tbl_name VALUES (1,2,3)" #: libraries/plugins/export/ExportSql.class.php:390 msgid "" "Dump binary columns in hexadecimal notation (for example, \"abc\" becomes " "0x616263)" msgstr "" +"Съхраняване на двоичните полета в шестнадесетичен вид (например, \"abc\" " +"става 0x616263)" #: libraries/plugins/export/ExportSql.class.php:403 msgid "" "Dump TIMESTAMP columns in UTC (enables TIMESTAMP columns to be dumped and " "reloaded between servers in different time zones)" msgstr "" +"Съхраняване на полета от вида TIMESTAMP в UTC формат(позволява полетата " +"TIMESTAMP да бъдат експортирани и четени от сървъри в различни часови " +"пояси)" #: libraries/plugins/export/ExportSql.class.php:1197 msgid "Constraints for dumped tables" @@ -8216,6 +8231,9 @@ msgid "" "Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php." msgstr "" +"Включване на допълнителните функции в конфигурационния файл " +"(config.inc.php), започнете с примера в " +"config.sample.inc.php." #: libraries/relation.lib.php:278 msgid "Re-login to phpMyAdmin to load the updated configuration file." @@ -9503,7 +9521,7 @@ msgstr "Индекс" #: libraries/structure.lib.php:1398 libraries/structure.lib.php:2060 #: libraries/structure.lib.php:2070 msgid "Spatial" -msgstr "" +msgstr "Пространствен" #: libraries/structure.lib.php:1408 libraries/structure.lib.php:2062 #: libraries/structure.lib.php:2072 @@ -9619,7 +9637,7 @@ msgstr "Добавяне на уникален ключ" #: libraries/structure.lib.php:2024 libraries/structure.lib.php:2027 msgid "Add SPATIAL index" -msgstr "Добавяне на SPATIAL индекс" +msgstr "Добавяне на пространствен индекс" #: libraries/structure.lib.php:2030 libraries/structure.lib.php:2033 msgid "Add FULLTEXT index" @@ -10754,6 +10772,10 @@ msgid "" "it suggests that the server is doing a lot of full index scans; for example, " "SELECT col1 FROM foo, assuming that col1 is indexed." msgstr "" +"Брой на четенията на първият запис от индекса. При голяма стойност се " +"подразбира, че сървърът извършва прекалено много пълни сканирания на " +"индекса; например, SELECT col1 FROM foo, при условие, че col1 е индексирано " +"поле." #: server_status_variables.php:397 msgid "" @@ -11073,6 +11095,8 @@ msgid "" "The number of tables that have been opened. If opened tables is big, your " "table cache value is probably too small." msgstr "" +"Общ брой на отворените таблици. Ако тази стойност е голяма, вероятно имате " +"прекалено малък кеш за таблиците (table_cache)." #: server_status_variables.php:640 msgid "The number of files that are open." @@ -11700,7 +11724,7 @@ msgstr "-- без --" #: tbl_gis_visualization.php:135 msgid "Spatial column" -msgstr "Пространствена колона" +msgstr "Пространствено поле" #: tbl_gis_visualization.php:150 msgid "Redraw" @@ -13004,7 +13028,7 @@ msgstr "Размер на дневника на InnoDB" msgid "" "The InnoDB log file size is not an appropriate size, in relation to the " "InnoDB buffer pool." -msgstr "" +msgstr "Размерът на лог-файла на InnoDB не съответства на буфера на InnoDB." #: libraries/advisory_rules.txt:440 #, php-format @@ -13026,6 +13050,8 @@ msgid "" "Your InnoDB log size is at %s%% in relation to the InnoDB buffer pool size, " "it should not be below 20%%" msgstr "" +"Размерът на вашият лог-файл на InnoDB е %s%% от размера на буфера на InnoDB, " +"това съотношение не трябва да е по-малко от 20%%" #: libraries/advisory_rules.txt:443 msgid "Max InnoDB log size" @@ -13033,7 +13059,7 @@ msgstr "Максимален размер на дневника на InnoDB" #: libraries/advisory_rules.txt:446 msgid "The InnoDB log file size is inadequately large." -msgstr "Дневникът на InnoDB е неоправдано голям." +msgstr "Лог-файла на InnoDB е неоправдано голям." #: libraries/advisory_rules.txt:447 #, php-format From 168fa47420b921e7fb3c2430c5dbb04e71b26b3b Mon Sep 17 00:00:00 2001 From: Yungu Kim Date: Sat, 8 Jun 2013 14:41:23 +0200 Subject: [PATCH 3/4] Translated using Weblate (Korean) Currently translated at 69.0% (1795 of 2603) --- po/ko.po | 90 +++++++++++++++++++++++++++----------------------------- 1 file changed, 44 insertions(+), 46 deletions(-) diff --git a/po/ko.po b/po/ko.po index a6eac25d3f..9f4b93265b 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-06-03 09:16-0400\n" -"PO-Revision-Date: 2013-06-05 14:39+0200\n" +"PO-Revision-Date: 2013-06-08 14:41+0200\n" "Last-Translator: Yungu Kim \n" "Language-Team: Korean \n" "Language: ko\n" @@ -4831,7 +4831,7 @@ msgstr "" #: libraries/config/messages.inc.php:259 msgid "Import percentages as proper decimals (12.00% to .12)" -msgstr "" +msgstr "퍼센티지값을 소수로 가져오기 (12.00%를 .12로)" #: libraries/config/messages.inc.php:260 msgid "Number of queries to skip from start" @@ -5028,37 +5028,37 @@ msgstr "" msgid "" "Defines the minimum number of items (tables, views, routines and events) to " "display a filter box." -msgstr "" +msgstr "필터 박스에 표시할 아이템(테이블, 뷰, 루틴, 이벤트)의 최소 개수를 정의." #: libraries/config/messages.inc.php:307 msgid "Minimum number of items to display the filter box" -msgstr "" +msgstr "필터 박스에 표시할 최소 아이템 개수" #: libraries/config/messages.inc.php:308 msgid "Minimum number of databases to display the database filter box" -msgstr "" +msgstr "데이터베이스 필터 박스에 표시할 최소 데이터베이스 수" #: libraries/config/messages.inc.php:309 msgid "" "Group items in the navigation tree (determined by the separator defined " "below)" -msgstr "" +msgstr "네비게이션 트리의 그룹 아이템 (아래 정의된 구분자로 구분)" #: libraries/config/messages.inc.php:310 msgid "Group items in the tree" -msgstr "" +msgstr "트리의 그룹 아이템" #: libraries/config/messages.inc.php:311 msgid "String that separates databases into different tree levels" -msgstr "" +msgstr "데이터베이스를 서로 다른 트리 레벨로 구분하기 위한 문자열" #: libraries/config/messages.inc.php:312 msgid "Database tree separator" -msgstr "" +msgstr "데이터베이스 트리 구분자" #: libraries/config/messages.inc.php:313 msgid "String that separates tables into different tree levels" -msgstr "" +msgstr "테이블을 서로 다른 트리 레벨로 구분하기 위한 문자열" #: libraries/config/messages.inc.php:314 msgid "Table tree separator" @@ -5070,7 +5070,7 @@ msgstr "테이블 트리의 최대 깊이(depth)" #: libraries/config/messages.inc.php:316 msgid "Highlight server under the mouse cursor" -msgstr "" +msgstr "마우스 커서 아래의 서버를 강조 표시" #: libraries/config/messages.inc.php:317 msgid "Enable highlighting" @@ -5078,7 +5078,7 @@ msgstr "강조 표시 사용" #: libraries/config/messages.inc.php:318 msgid "Maximum number of recently used tables; set 0 to disable" -msgstr "" +msgstr "최근 사용한 테이블 최대 개수; 0이면 이 기능 사용 안 함" #: libraries/config/messages.inc.php:319 msgid "Recently used tables" @@ -5086,25 +5086,24 @@ msgstr "최근 사용한 테이블" #: libraries/config/messages.inc.php:320 msgid "These are Edit, Copy and Delete links" -msgstr "" +msgstr "수정, 복사, 삭제 링크가 있음" #: libraries/config/messages.inc.php:321 msgid "Where to show the table row links" -msgstr "" +msgstr "테이블 열 링크를 표시할 위치" #: libraries/config/messages.inc.php:322 msgid "Use natural order for sorting table and database names" -msgstr "" +msgstr "테이블과 데이터베이스를 정렬할 때 자연 순서(natural order) 사용" #: libraries/config/messages.inc.php:323 -#, fuzzy #| msgid "Alter table order by" msgid "Natural order" -msgstr "다음 순서대로 테이블 정렬(변경)" +msgstr "자연순서" #: libraries/config/messages.inc.php:324 libraries/config/messages.inc.php:338 msgid "Use only icons, only text or both" -msgstr "" +msgstr "아이콘만 사용, 텍스트만 사용, 둘 다 사용" #: libraries/config/messages.inc.php:325 msgid "Iconic navigation bar" @@ -9894,11 +9893,11 @@ msgstr "설정을 가져올 수 없습니다" #: prefs_manage.php:113 msgid "Configuration contains incorrect data for some fields." -msgstr "" +msgstr "설정의 일부 항목에 잘못된 데이터가 있습니다." #: prefs_manage.php:129 msgid "Do you want to import remaining settings?" -msgstr "" +msgstr "나머지 설정을 가져오겠습니까?" #: prefs_manage.php:226 prefs_manage.php:252 msgid "Saved on: @DATE@" @@ -9910,15 +9909,15 @@ msgstr "파일에서 가져오기" #: prefs_manage.php:246 msgid "Import from browser's storage" -msgstr "" +msgstr "브라우저 스토리지에서 가져오기" #: prefs_manage.php:249 msgid "Settings will be imported from your browser's local storage." -msgstr "" +msgstr "웹 브라우저의 로컬 스토리지로부터 설정을 불러옵니다." #: prefs_manage.php:255 msgid "You have no saved settings!" -msgstr "" +msgstr "저장된 설정이 없습니다!" #: prefs_manage.php:259 prefs_manage.php:312 msgid "This feature is not supported by your web browser" @@ -9926,22 +9925,22 @@ msgstr "" #: prefs_manage.php:264 msgid "Merge with current configuration" -msgstr "" +msgstr "현재 설정과 합치기" #: prefs_manage.php:278 #, php-format msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." -msgstr "" +msgstr "%s셋업 스크립트%s를 사용하는 등의 방법으로 config.inc.php를 수정하여 더 많은 설정을 조정할 수 있습니다." #: 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." -msgstr "" +msgstr "설정 내용이 웹 브라우저의 로컬 스토리지에 저장됩니다." #: prefs_manage.php:308 msgid "Existing settings will be overwritten!" @@ -9949,7 +9948,7 @@ msgstr "기존 설정에 덮여쓰여집니다!" #: prefs_manage.php:323 msgid "You can reset all your settings and restore them to default values." -msgstr "" +msgstr "모든 설정을 초기화할 수 있습니다." #: querywindow.php:64 msgid "Import files" @@ -9962,19 +9961,19 @@ msgstr "모두" #: schema_edit.php:36 schema_edit.php:42 schema_edit.php:48 schema_edit.php:53 #, php-format msgid "%s table not found or not set in %s" -msgstr "" +msgstr "테이블 %s를 찾을 수 없음 (또는 %s에 정의되어있지 않음)" #: schema_export.php:62 msgid "File doesn't exist" -msgstr "파일이 존재하지 않습니다." +msgstr "파일이 없음" #: server_binlog.php:84 msgid "Select binary log to view" -msgstr "" +msgstr "표시할 바이너리 로그를 선택하세요" #: server_binlog.php:154 server_status.php:431 msgid "Truncate Shown Queries" -msgstr "" +msgstr "보여줄 쿼리 중략하기" #: server_binlog.php:158 server_status.php:436 msgid "Show Full Queries" @@ -9994,7 +9993,7 @@ msgstr "원본 위치" #: server_collations.php:24 msgid "Character Sets and Collations" -msgstr "" +msgstr "문자셋과 정렬" #: server_databases.php:117 #, php-format @@ -10009,11 +10008,11 @@ msgstr "데이터베이스 사용량 통계" #: server_databases.php:226 server_replication.php:167 #: server_replication.php:198 msgid "Master replication" -msgstr "" +msgstr "마스터 리플리케이션" #: server_databases.php:228 server_replication.php:236 msgid "Slave replication" -msgstr "" +msgstr "슬레이브 리플리케이션" #: server_databases.php:334 server_databases.php:335 msgid "Enable Statistics" @@ -10032,16 +10031,15 @@ msgstr "데이터베이스가 없습니다" #: server_engines.php:32 msgid "Storage Engines" -msgstr "" +msgstr "스토리지 엔진" #: server_export.php:20 -#, fuzzy msgid "View dump (schema) of databases" msgstr "데이터베이스의 덤프(스키마) 데이터 보기" #: server_plugins.php:66 msgid "Modules" -msgstr "" +msgstr "모듈" #: server_plugins.php:87 msgid "Begin" @@ -10049,15 +10047,15 @@ msgstr "처음" #: server_plugins.php:94 msgid "Plugin" -msgstr "" +msgstr "플러그인" #: server_plugins.php:95 server_plugins.php:129 msgid "Module" -msgstr "" +msgstr "모듈" #: server_plugins.php:96 server_plugins.php:131 msgid "Library" -msgstr "" +msgstr "라이브러리" #: server_plugins.php:97 server_plugins.php:132 tbl_tracking.php:763 msgid "Version" @@ -10065,11 +10063,11 @@ msgstr "버전" #: server_plugins.php:98 server_plugins.php:133 msgid "Author" -msgstr "" +msgstr "저자" #: server_plugins.php:99 server_plugins.php:134 msgid "License" -msgstr "" +msgstr "라이선스" #: server_plugins.php:165 msgid "disabled" @@ -10096,16 +10094,16 @@ msgstr "알려지지 않은 오류" #: server_replication.php:89 #, php-format msgid "Unable to connect to master %s." -msgstr "" +msgstr "마스터 %s에 접속할 수 없음." #: server_replication.php:98 msgid "" "Unable to read master log position. Possible privilege problem on master." -msgstr "" +msgstr "마스터의 로그 위치를 읽어올 수 없습니다. 마스터 쪽의 권한 문제일 수 있습니다." #: server_replication.php:104 msgid "Unable to change master" -msgstr "" +msgstr "마스터를 변경할 수 없음" #: server_replication.php:108 #, php-format From c690e5279a66c1967ef4543b959fff956e1fd211 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 8 Jun 2013 08:43:56 -0400 Subject: [PATCH 4/4] Fix merge conflict --- libraries/Menu.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php index a324de70cb..a7b7bc5636 100644 --- a/libraries/Menu.class.php +++ b/libraries/Menu.class.php @@ -427,7 +427,7 @@ class PMA_Menu */ private function _getServerTabs() { - $is_superuser = $GLOBALS['dbi']->isSuperuser(); + $is_superuser = isset($GLOBALS['dbi']) && $GLOBALS['dbi']->isSuperuser(); $binary_logs = null; if (!defined('PMA_DRIZZLE') || (defined('PMA_DRIZZLE') && ! PMA_DRIZZLE)) { $binary_logs = $GLOBALS['dbi']->fetchResult(