From 57ba284f13e57bb729179db4e44bd6a7342b949e Mon Sep 17 00:00:00 2001 From: Dong-bum Kim Date: Fri, 21 Dec 2012 20:48:12 +0100 Subject: [PATCH 01/22] Translated using Weblate (Korean) Currently translated at 32.7% (851 of 2603) --- po/ko.po | 138 ++++++++++++++++++++++++------------------------------- 1 file changed, 61 insertions(+), 77 deletions(-) diff --git a/po/ko.po b/po/ko.po index ed7c80e146..5164533f94 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,14 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-12-19 10:08-0500\n" -"PO-Revision-Date: 2012-11-21 15:57+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Korean \n" +"PO-Revision-Date: 2012-12-21 20:48+0200\n" +"Last-Translator: Dong-bum Kim \n" +"Language-Team: Korean \n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Weblate 1.4-dev\n" @@ -799,7 +798,7 @@ msgstr "문서" #: index.php:337 libraries/config/FormDisplay.tpl.php:148 msgid "Wiki" -msgstr "" +msgstr "위키" #: index.php:346 msgid "Official Homepage" @@ -1757,7 +1756,7 @@ msgstr "포인트에 마우스를 올리면 라벨이 표시됩니다." #: js/messages.php:293 msgid "To zoom in, select a section of the plot with the mouse." -msgstr "" +msgstr "확대하려면 선택한 플롯을 클릭하세요." #: js/messages.php:295 msgid "Click reset zoom button to come back to original state." @@ -1769,7 +1768,7 @@ msgstr "" #: js/messages.php:299 msgid "The plot can be resized by dragging it along the bottom right corner." -msgstr "" +msgstr "우측 하단 코너로 드래그하여 플롯을 확대할 수 있습니다." #: js/messages.php:301 msgid "Select two columns" @@ -1808,14 +1807,13 @@ msgstr "" #: js/messages.php:327 msgid "Select Foreign Key" -msgstr "" +msgstr "외래키 선택" #: js/messages.php:328 msgid "Please select the primary key or a unique key" -msgstr "" +msgstr "기본키 혹은 유니크키를 선택하십시오." #: js/messages.php:329 pmd_general.php:109 tbl_relation.php:502 -#, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "출력할 필드 선택" @@ -1828,7 +1826,7 @@ msgstr "" #: js/messages.php:333 msgid "Add an option for column " -msgstr "" +msgstr "필드 옵션 추가" #: js/messages.php:334 #, php-format @@ -1837,7 +1835,7 @@ msgstr "" #: js/messages.php:337 msgid "Press escape to cancel editing" -msgstr "" +msgstr "편집을 취소하려면 ESC를 누르세요." #: js/messages.php:338 msgid "" @@ -1847,11 +1845,11 @@ msgstr "" #: js/messages.php:339 msgid "Drag to reorder" -msgstr "" +msgstr "재정렬하려면 드래그하세요." #: js/messages.php:340 msgid "Click to sort" -msgstr "" +msgstr "정렬하려면 클릭하세요." #: js/messages.php:341 msgid "Click to mark/unmark" @@ -1881,7 +1879,7 @@ msgstr "" #: js/messages.php:358 msgid "Go to link" -msgstr "" +msgstr "링크로 이동합니다." #: js/messages.php:359 #, fuzzy @@ -1900,26 +1898,23 @@ msgid "Show data row(s)" msgstr "행 업데이트" #: js/messages.php:364 -#, fuzzy #| msgid "Change password" msgid "Generate password" -msgstr "암호 변경" +msgstr "암호 생성" #: js/messages.php:365 libraries/replication_gui.lib.php:389 msgid "Generate" -msgstr "" +msgstr "생성" #: js/messages.php:366 -#, fuzzy #| msgid "Change password" msgid "Change Password" msgstr "암호 변경" #: js/messages.php:369 -#, fuzzy #| msgid "Mo" msgid "More" -msgstr "월" +msgstr "더보기" #: js/messages.php:372 #, fuzzy @@ -1944,17 +1939,16 @@ msgstr "선택한 사용자는 사용권한 테이블에 존재하지 않습니 msgid "" "A newer version of phpMyAdmin is available and you should consider " "upgrading. The newest version is %s, released on %s." -msgstr "" +msgstr "phpMyAdmin 업그레이드가 필요합니다. 최신버전은 %s이며 %s에 릴리즈 되었습니다." #. l10n: Latest available phpMyAdmin version #: js/messages.php:381 msgid ", latest stable version:" -msgstr "" +msgstr ", 최신 안정 버전:" #: js/messages.php:382 -#, fuzzy msgid "up to date" -msgstr "데이터베이스가 없습니다" +msgstr "최신버전" #. l10n: Display text for calendar close link #: js/messages.php:401 @@ -1962,14 +1956,12 @@ msgid "Done" msgstr "완료" #: js/messages.php:405 -#, fuzzy #| msgid "Prev" msgctxt "Previous month" msgid "Prev" msgstr "이전" #: js/messages.php:410 -#, fuzzy #| msgid "Next" msgctxt "Next month" msgid "Next" @@ -2119,7 +2111,6 @@ msgstr "토요일" #. l10n: Short week day name #: js/messages.php:476 -#, fuzzy #| msgctxt "Short week day name" #| msgid "Sun" msgid "Sun" @@ -2202,7 +2193,6 @@ msgstr "" #. l10n: Year suffix for calendar, "none" is empty. #: js/messages.php:516 -#, fuzzy #| msgid "None" msgctxt "Year suffix" msgid "none" @@ -2269,20 +2259,20 @@ msgstr "" #: libraries/Advisor.class.php:450 server_status_queries.php:86 msgid "per second" -msgstr "" +msgstr "초당" #: libraries/Advisor.class.php:453 server_status_queries.php:82 msgid "per minute" -msgstr "" +msgstr "분당" #: libraries/Advisor.class.php:456 server_status.php:144 server_status.php:213 #: server_status_queries.php:79 server_status_queries.php:108 msgid "per hour" -msgstr "" +msgstr "시간당" #: libraries/Advisor.class.php:459 msgid "per day" -msgstr "" +msgstr "하루당" #: libraries/Config.class.php:1050 #, php-format @@ -2706,11 +2696,11 @@ msgstr "" #: libraries/Error_Handler.class.php:73 msgid "Too many error messages, some are not displayed." -msgstr "" +msgstr "오류메시지가 너무 많기 때문에 일부 메시지는 출력되지 않습니다." #: libraries/File.class.php:239 msgid "File was not an uploaded file." -msgstr "" +msgstr "파일은 업로드된 파일이 아닙니다." #: libraries/File.class.php:279 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." @@ -2751,7 +2741,7 @@ msgstr "" #: libraries/File.class.php:493 msgid "Error while moving uploaded file." -msgstr "" +msgstr "업로드된 파일을 이동하는 중에 오류가 발생하였습니다." #: libraries/File.class.php:501 msgid "Cannot read (moved) upload file." @@ -2997,16 +2987,15 @@ msgstr "PDF 생성 실패:" #: libraries/RecentTable.class.php:114 msgid "Could not save recent table" -msgstr "" +msgstr "최근 테이블을 저장할 수 없습니다." #: libraries/RecentTable.class.php:151 -#, fuzzy msgid "Recent tables" -msgstr "테이블이 없습니다" +msgstr "최근 테이블" #: libraries/RecentTable.class.php:163 msgid "There are no recent tables" -msgstr "" +msgstr "최근 테이블이 없습니다." #: libraries/ServerStatusData.class.php:181 libraries/Util.class.php:666 #: server_status.php:341 sql.php:1094 @@ -3123,12 +3112,12 @@ msgstr "%s는 이 MySQL 서버의 기본 스토리지 엔진입니다." #: libraries/StorageEngine.class.php:355 #, php-format msgid "%s is available on this MySQL server." -msgstr "" +msgstr "%s 는 이 MySQL 서버에서 가능합니다." #: libraries/StorageEngine.class.php:358 #, php-format msgid "%s has been disabled for this MySQL server." -msgstr "" +msgstr "%s 는 이 MySQL 서버에서 비활성화되었습니다." #: libraries/StorageEngine.class.php:362 #, php-format @@ -3137,7 +3126,7 @@ msgstr "이 MySQL 서버는 %s 스토리지 엔진을 지원하지 않습니다. #: libraries/Table.class.php:327 msgid "unknown table status: " -msgstr "" +msgstr "알 수 없는 테이블 상태:" #: libraries/Table.class.php:726 #, fuzzy, php-format @@ -3151,16 +3140,16 @@ msgstr "데이터베이스 검색" #: libraries/Table.class.php:1162 msgid "Invalid database" -msgstr "" +msgstr "잘못된 데이터베이스" #: libraries/Table.class.php:1176 tbl_get_field.php:30 msgid "Invalid table name" -msgstr "" +msgstr "잘못된 테이블 이름" #: libraries/Table.class.php:1208 #, php-format msgid "Error renaming table %1$s to %2$s" -msgstr "" +msgstr "%1$s 에서 %2$s 로 테이블 이름을 바꾸는데 오류가 발생하였습니다." #: libraries/Table.class.php:1227 #, fuzzy, php-format @@ -3286,7 +3275,7 @@ msgstr "" #: libraries/Theme.class.php:459 msgid "No preview available." -msgstr "" +msgstr "미리보기가 불가능합니다." #: libraries/Theme.class.php:461 msgid "take it" @@ -3295,12 +3284,12 @@ msgstr "" #: libraries/Theme_Manager.class.php:137 #, php-format msgid "Default theme %s not found!" -msgstr "" +msgstr "기본테마 %s 를 찾을 수 없습니다." #: libraries/Theme_Manager.class.php:194 #, php-format msgid "Theme %s not found!" -msgstr "" +msgstr "%s 테마를 찾을 수 없습니다." #: libraries/Theme_Manager.class.php:271 #, php-format @@ -3309,7 +3298,7 @@ msgstr "" #: libraries/Theme_Manager.class.php:363 themes.php:16 themes.php:21 msgid "Theme" -msgstr "" +msgstr "테마" #: libraries/Types.class.php:296 msgid "" @@ -3756,9 +3745,8 @@ msgid "Overhead" msgstr "부담" #: libraries/build_html_for_db.lib.php:94 -#, fuzzy msgid "Jump to database" -msgstr "데이터베이스가 없습니다" +msgstr "데이터베이스로 이동" #: libraries/build_html_for_db.lib.php:142 msgid "Not replicated" @@ -3851,11 +3839,11 @@ msgstr "" #: libraries/config.values.php:56 msgid "Left" -msgstr "" +msgstr "왼쪽" #: libraries/config.values.php:57 msgid "Right" -msgstr "" +msgstr "오른쪽" #: libraries/config.values.php:69 msgid "Click" @@ -3873,7 +3861,7 @@ msgstr "사용불가" #: libraries/config.values.php:101 msgid "Open" -msgstr "" +msgstr "열기" #: libraries/config.values.php:102 #, fuzzy @@ -3900,7 +3888,7 @@ msgstr "구조" #: libraries/plugins/export/ExportSql.class.php:198 #: libraries/plugins/export/ExportTexytext.class.php:69 msgid "data" -msgstr "" +msgstr "데이터" #: libraries/config.values.php:134 #: libraries/plugins/export/ExportHtmlword.class.php:71 @@ -3959,19 +3947,19 @@ msgstr "" #: libraries/config/FormDisplay.class.php:90 #: libraries/config/validate.lib.php:504 msgid "Not a valid port number" -msgstr "" +msgstr "유효한 포트번호가 아닙니다." #: libraries/config/FormDisplay.class.php:91 #: libraries/config/FormDisplay.class.php:587 #: libraries/config/validate.lib.php:435 libraries/config/validate.lib.php:566 msgid "Incorrect value" -msgstr "" +msgstr "잘못된 값" #: libraries/config/FormDisplay.class.php:92 #: libraries/config/validate.lib.php:582 #, php-format msgid "Value must be equal or lower than %s" -msgstr "" +msgstr "값은 %s보다 작거나 같아야합니다." #: libraries/config/FormDisplay.class.php:541 #, php-format @@ -3980,10 +3968,9 @@ msgstr "" #: libraries/config/FormDisplay.class.php:765 #: libraries/config/FormDisplay.class.php:771 -#, fuzzy #| msgid "Variable" msgid "unavailable" -msgstr "변수" +msgstr "사용불가" #: libraries/config/FormDisplay.class.php:767 #: libraries/config/FormDisplay.class.php:773 @@ -4012,7 +3999,7 @@ msgstr "" #: libraries/config/FormDisplay.class.php:825 #, php-format msgid "maximum %s" -msgstr "" +msgstr "최대 %s" #: libraries/config/FormDisplay.tpl.php:223 msgid "This setting is disabled, it will not be applied to your configuration" @@ -7651,7 +7638,7 @@ msgstr "" #: libraries/plugins/auth/swekey/swekey.auth.lib.php:176 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:196 msgid "Hardware authentication failed" -msgstr "" +msgstr "하드웨어 인증 실패" #: libraries/plugins/auth/swekey/swekey.auth.lib.php:183 msgid "No valid authentication key plugged" @@ -13086,10 +13073,9 @@ msgid "Percentage of aborted connections" msgstr "연결 수" #: libraries/advisory_rules.txt:402 libraries/advisory_rules.txt:409 -#, fuzzy #| msgid "Allows creating temporary tables." msgid "Too many connections are aborted." -msgstr "임시테이블 생성 허용." +msgstr "너무 많은 연결이 종료되었습니다." #: libraries/advisory_rules.txt:403 libraries/advisory_rules.txt:410 msgid "" @@ -13105,10 +13091,9 @@ msgid "%s%% of all connections are aborted. This value should be below 1%%" msgstr "" #: libraries/advisory_rules.txt:406 -#, fuzzy #| msgid "Connections" msgid "Rate of aborted connections" -msgstr "연결 수" +msgstr "종료된 연결 비율" #: libraries/advisory_rules.txt:411 #, php-format @@ -13122,10 +13107,9 @@ msgid "Percentage of aborted clients" msgstr "테이블 설명" #: libraries/advisory_rules.txt:416 libraries/advisory_rules.txt:423 -#, fuzzy #| msgid "Allows creating temporary tables." msgid "Too many clients are aborted." -msgstr "임시테이블 생성 허용." +msgstr "너무 많은 클라이언트가 종료되었습니다." #: libraries/advisory_rules.txt:417 libraries/advisory_rules.txt:424 msgid "" @@ -13151,11 +13135,11 @@ msgstr "" #: libraries/advisory_rules.txt:429 msgid "Is InnoDB disabled?" -msgstr "" +msgstr "InnoDB를 비활성화할까요?" #: libraries/advisory_rules.txt:432 msgid "You do not have InnoDB enabled." -msgstr "" +msgstr "InnoDB가 활성화되지 않았습니다." #: libraries/advisory_rules.txt:433 msgid "InnoDB is usually the better choice for table engines." @@ -13167,7 +13151,7 @@ msgstr "" #: libraries/advisory_rules.txt:436 msgid "InnoDB log size" -msgstr "" +msgstr "InnoDB 로그 크기" #: libraries/advisory_rules.txt:439 msgid "" @@ -13198,7 +13182,7 @@ msgstr "" #: libraries/advisory_rules.txt:443 msgid "Max InnoDB log size" -msgstr "" +msgstr "InnoDB 로그 최대크기" #: libraries/advisory_rules.txt:446 msgid "The InnoDB log file size is inadequately large." @@ -13225,7 +13209,7 @@ msgstr "" #: libraries/advisory_rules.txt:450 msgid "InnoDB buffer pool size" -msgstr "" +msgstr "InnoDB 버퍼풀 크기" #: libraries/advisory_rules.txt:453 msgid "Your InnoDB buffer pool is fairly small." @@ -13261,7 +13245,7 @@ msgstr "" #: libraries/advisory_rules.txt:462 msgid "Enable concurrent_insert by setting it to 1" -msgstr "" +msgstr "concurrent_insert를 1로 활성화합니다." #: libraries/advisory_rules.txt:463 msgid "" @@ -13272,7 +13256,7 @@ msgstr "" #: libraries/advisory_rules.txt:464 msgid "concurrent_insert is set to 0" -msgstr "" +msgstr "concurrent_insert가 0으로 설정되었습니다." #~ msgid "KiB sent since last refresh" #~ msgstr "KiB가 마지막 새로고침 이후로 전송되었습니다." From 55c8908875583c74bb4972d4cd1265ec3059d4cc Mon Sep 17 00:00:00 2001 From: Dong-bum Kim Date: Sun, 23 Dec 2012 18:15:15 +0100 Subject: [PATCH 02/22] Translated using Weblate (Korean) Currently translated at 33.4% (870 of 2601) --- po/ko.po | 62 ++++++++++++++++++++++++-------------------------------- 1 file changed, 27 insertions(+), 35 deletions(-) diff --git a/po/ko.po b/po/ko.po index 74864a653f..a43d98a16f 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-12-22 13:22-0500\n" -"PO-Revision-Date: 2012-12-21 20:48+0200\n" +"PO-Revision-Date: 2012-12-23 18:15+0200\n" "Last-Translator: Dong-bum Kim \n" "Language-Team: Korean \n" "Language: ko\n" @@ -702,7 +702,7 @@ msgstr "" #: libraries/sql_query_form.lib.php:114 tbl_operations.php:182 #: tbl_relation.php:238 tbl_row_action.php:122 view_operations.php:56 msgid "Your SQL query has been executed successfully" -msgstr "질의가 바르게 실행되었습니다." +msgstr "질의가 성공적으로 실행되었습니다." #: import_status.php:101 libraries/Util.class.php:757 #: libraries/schema/Export_Relation_Schema.class.php:239 user_password.php:240 @@ -1246,7 +1246,7 @@ msgstr "general_log 가 활성화 되었습니다." #: js/messages.php:132 msgid "slow_query_log is enabled." -msgstr "슬로우 쿼리 로그가 활성화 되었습니다." +msgstr "slow_query_log 가 활성화 되었습니다." #: js/messages.php:133 msgid "slow_query_log and general_log are disabled." @@ -3130,7 +3130,7 @@ msgstr "이 MySQL 서버는 %s 스토리지 엔진을 지원하지 않습니다. #: libraries/Table.class.php:327 msgid "unknown table status: " -msgstr "알 수 없는 테이블 상태:" +msgstr "알 수 없는 테이블 상태: " #: libraries/Table.class.php:726 #, fuzzy, php-format @@ -3809,7 +3809,7 @@ msgstr "서버 %1$s의 호스트 이름이 잘못되었습니다. 설정을 확 #: libraries/common.inc.php:846 msgid "Invalid authentication method set in configuration:" -msgstr "설정 파일에 인증 방식이 제대로 설정이 되어 있지 않습니다." +msgstr "설정 파일에 잘못된 인증 방식 설정되어 있습니다.: " #: libraries/common.inc.php:968 #, php-format @@ -8948,7 +8948,7 @@ msgstr "" #: libraries/schema/User_Schema.class.php:448 msgid "Display all tables with the same width" -msgstr "모든 테이블을 같은 너비로 출력할까요?" +msgstr "모든 테이블을 같은 너비로 출력합니다." #: libraries/schema/User_Schema.class.php:451 libraries/structure.lib.php:379 msgid "Data Dictionary" @@ -9561,7 +9561,7 @@ msgstr "뷰 %s가 제거되었습니다." #: libraries/structure.lib.php:130 tbl_operations.php:328 #, php-format msgid "Table %s has been dropped" -msgstr "테이블 %s를 제거했습니다." +msgstr "테이블 %s를 삭제했습니다." #: libraries/structure.lib.php:185 msgid "Sum" @@ -9695,7 +9695,7 @@ msgstr "행 길이" #: libraries/structure.lib.php:1761 tbl_printview.php:390 msgid "Row size" -msgstr "Row size" +msgstr "행 크기" #: libraries/structure.lib.php:1769 tbl_printview.php:399 msgid "Next autoindex" @@ -12819,7 +12819,7 @@ msgstr "" #: libraries/advisory_rules.txt:301 msgid "key_buffer_size is 0" -msgstr "" +msgstr "key_buffer_size가 0입니다." #: libraries/advisory_rules.txt:303 #, fuzzy, php-format @@ -12845,9 +12845,8 @@ msgid "" msgstr "" #: libraries/advisory_rules.txt:311 -#, fuzzy msgid "Percentage of MyISAM key buffer used" -msgstr "SQL 질의" +msgstr "사용된 MyISAM 키 버퍼 비율" #: libraries/advisory_rules.txt:316 #, php-format @@ -12874,14 +12873,12 @@ msgid "Index reads from memory: %s%%, this value should be above 95%%" msgstr "" #: libraries/advisory_rules.txt:327 -#, fuzzy msgid "Rate of table open" -msgstr "새 페이지 만들기" +msgstr "열린 테이블 비율" #: libraries/advisory_rules.txt:330 -#, fuzzy msgid "The rate of opening tables is high." -msgstr "파일 문자셋:" +msgstr "열려있는 테이블의 비율이 너무 높습니다." #: libraries/advisory_rules.txt:331 msgid "" @@ -12892,7 +12889,7 @@ msgstr "" #: libraries/advisory_rules.txt:332 #, php-format msgid "Opened table rate: %s, this value should be less than 10 per hour" -msgstr "" +msgstr "열린 테이블 비율: %s, 이 값은 시간당 10보다 작아야 합니다." #: libraries/advisory_rules.txt:334 #, fuzzy @@ -12918,19 +12915,17 @@ msgid "" msgstr "" #: libraries/advisory_rules.txt:341 -#, fuzzy msgid "Rate of open files" -msgstr "파일 문자셋:" +msgstr "열린 파일 비율" #: libraries/advisory_rules.txt:344 -#, fuzzy msgid "The rate of opening files is high." -msgstr "파일 문자셋:" +msgstr "열려있는 파일의 비율이 너무 높습니다." #: libraries/advisory_rules.txt:346 #, php-format msgid "Opened files rate: %s, this value should be less than 5 per hour" -msgstr "" +msgstr "열린 파일 비율: %s, 이 값은 시간당 5 미만이어야 합니다." #: libraries/advisory_rules.txt:348 #, fuzzy, php-format @@ -12953,7 +12948,7 @@ msgstr "" #: libraries/advisory_rules.txt:355 msgid "Table lock wait rate" -msgstr "" +msgstr "테이블락 대기 비율" #: libraries/advisory_rules.txt:360 #, php-format @@ -12961,9 +12956,8 @@ msgid "Table lock wait rate: %s, this value should be less than 1 per hour" msgstr "" #: libraries/advisory_rules.txt:362 -#, fuzzy msgid "Thread cache" -msgstr "질의 종류" +msgstr "스레드 캐시" #: libraries/advisory_rules.txt:365 msgid "" @@ -13004,11 +12998,11 @@ msgstr "" #: libraries/advisory_rules.txt:376 msgid "Threads that are slow to launch" -msgstr "" +msgstr "스레드들이 실행하는데 너무 느립니다." #: libraries/advisory_rules.txt:379 msgid "There are too many threads that are slow to launch." -msgstr "" +msgstr "실행이 느린 스레드가 너무 많습니다." #: libraries/advisory_rules.txt:380 msgid "" @@ -13069,10 +13063,9 @@ msgid "" msgstr "" #: libraries/advisory_rules.txt:399 -#, fuzzy #| msgid "Connections" msgid "Percentage of aborted connections" -msgstr "연결 수" +msgstr "종료된 연결의 비율" #: libraries/advisory_rules.txt:402 libraries/advisory_rules.txt:409 #| msgid "Allows creating temporary tables." @@ -13101,12 +13094,11 @@ msgstr "종료된 연결 비율" #, php-format msgid "" "Aborted connections rate is at %s, this value should be less than 1 per hour" -msgstr "" +msgstr "종료된 연결 비율이 %s 입니다. 이 값은 시간당 1 이하이어야 합니다." #: libraries/advisory_rules.txt:413 -#, fuzzy msgid "Percentage of aborted clients" -msgstr "테이블 설명" +msgstr "종료된 클라이언트 비율" #: libraries/advisory_rules.txt:416 libraries/advisory_rules.txt:423 #| msgid "Allows creating temporary tables." @@ -13145,7 +13137,7 @@ msgstr "InnoDB가 활성화되지 않았습니다." #: libraries/advisory_rules.txt:433 msgid "InnoDB is usually the better choice for table engines." -msgstr "" +msgstr "테이블엔진 선택에서 일반적으로 InnoDB는 가장 좋은 선택입니다." #: libraries/advisory_rules.txt:434 msgid "have_innodb is set to 'value'" @@ -13188,7 +13180,7 @@ msgstr "InnoDB 로그 최대크기" #: libraries/advisory_rules.txt:446 msgid "The InnoDB log file size is inadequately large." -msgstr "" +msgstr "InnoDB 로그 파일크기가 비정상적으로 큽니다." #: libraries/advisory_rules.txt:447 #, php-format @@ -13207,7 +13199,7 @@ msgstr "" #: libraries/advisory_rules.txt:448 #, php-format msgid "Your absolute InnoDB log size is %s MiB" -msgstr "" +msgstr "InnoDB 로그 절대크기는 %s MiB 입니다." #: libraries/advisory_rules.txt:450 msgid "InnoDB buffer pool size" @@ -13215,7 +13207,7 @@ msgstr "InnoDB 버퍼풀 크기" #: libraries/advisory_rules.txt:453 msgid "Your InnoDB buffer pool is fairly small." -msgstr "" +msgstr "InnoDB 버퍼풀이 너무 작습니다." #: libraries/advisory_rules.txt:454 #, php-format From eb82bf1987526e41f517c579dfe29da6ac58ade4 Mon Sep 17 00:00:00 2001 From: Seongki Shin Date: Mon, 24 Dec 2012 02:11:18 +0100 Subject: [PATCH 03/22] Translated using Weblate (Korean) Currently translated at 33.7% (876 of 2601) --- po/ko.po | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/po/ko.po b/po/ko.po index a43d98a16f..2609e3bd09 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-12-22 13:22-0500\n" -"PO-Revision-Date: 2012-12-23 18:15+0200\n" -"Last-Translator: Dong-bum Kim \n" +"PO-Revision-Date: 2012-12-24 02:11+0200\n" +"Last-Translator: Seongki Shin \n" "Language-Team: Korean \n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -711,7 +711,7 @@ msgstr "뒤로" #: index.php:114 msgid "General Settings" -msgstr "" +msgstr "일반 설정" #: index.php:140 libraries/display_change_password.lib.php:44 #: user_password.php:234 @@ -744,7 +744,7 @@ msgstr "서버" #: index.php:234 msgid "Software" -msgstr "" +msgstr "소프트웨어" #: index.php:238 #, fuzzy @@ -754,7 +754,7 @@ msgstr "버전 보기" #: index.php:242 msgid "Protocol version" -msgstr "" +msgstr "제품 버전" #: index.php:246 libraries/server_privileges.lib.php:1578 #: libraries/server_privileges.lib.php:2389 @@ -764,19 +764,17 @@ msgid "User" msgstr "사용자" #: index.php:251 -#, fuzzy msgid "Server charset" -msgstr "서버 선택" +msgstr "서버 문자셋" #: index.php:263 msgid "Web server" -msgstr "" +msgstr "웹서버" #: index.php:276 -#, fuzzy #| msgid "Database comment: " msgid "Database client version" -msgstr "데이터베이스 설명:" +msgstr "데이터베이스 클라이언트 버전" #: index.php:280 #, fuzzy From 16e26d3a20af0e523f161008654985579d7957c7 Mon Sep 17 00:00:00 2001 From: Deokyun Yu Date: Mon, 24 Dec 2012 02:46:32 +0100 Subject: [PATCH 04/22] Translated using Weblate (Korean) Currently translated at 33.8% (880 of 2601) --- po/ko.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/po/ko.po b/po/ko.po index 2609e3bd09..ea09ff4752 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-12-22 13:22-0500\n" -"PO-Revision-Date: 2012-12-24 02:11+0200\n" -"Last-Translator: Seongki Shin \n" +"PO-Revision-Date: 2012-12-24 02:46+0200\n" +"Last-Translator: Deokyun Yu \n" "Language-Team: Korean \n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -542,7 +542,7 @@ msgstr "SRID" #: gis_data_editor.php:184 js/messages.php:315 #: libraries/DisplayResults.class.php:1641 msgid "Geometry" -msgstr "Geometry" +msgstr "기하데이터" #: gis_data_editor.php:206 js/messages.php:311 msgid "Point" @@ -1764,8 +1764,9 @@ msgid "Click reset zoom button to come back to original state." msgstr "" #: js/messages.php:297 +#, fuzzy msgid "Click a data point to view and possibly edit the data row." -msgstr "" +msgstr "데이터 포인트(플롯 지점)를 클릭하면 행의 열람과 편집이 가능합니다." #: js/messages.php:299 msgid "The plot can be resized by dragging it along the bottom right corner." @@ -1804,7 +1805,7 @@ msgstr "필드 추가하기" #: js/messages.php:326 msgid "Select referenced key" -msgstr "" +msgstr "참고키 선택" #: js/messages.php:327 msgid "Select Foreign Key" @@ -1823,7 +1824,7 @@ msgstr "출력할 필드 선택" msgid "" "You haven't saved the changes in the layout. They will be lost if you don't " "save them. Do you want to continue?" -msgstr "" +msgstr "레이아웃의 변경을 저장하지 않았습니다. 저장하지 않으면, 변경사항이 손실됩니다. 이대로 계속 하시겠습니까?" #: js/messages.php:333 msgid "Add an option for column " @@ -1842,7 +1843,7 @@ msgstr "편집을 취소하려면 ESC를 누르세요." msgid "" "You have edited some data and they have not been saved. Are you sure you " "want to leave this page before saving the data?" -msgstr "" +msgstr "일부 데이터를 변경한 후 저장하지 않았습니다. 데이터를 저장하지 않고 페이지를 이동하기를 원합니까?" #: js/messages.php:339 msgid "Drag to reorder" @@ -1854,7 +1855,7 @@ msgstr "정렬하려면 클릭하세요." #: js/messages.php:341 msgid "Click to mark/unmark" -msgstr "" +msgstr "선택/해제하려면 클릭하세요." #: js/messages.php:342 msgid "Double-click to copy column name" @@ -2313,7 +2314,7 @@ msgstr "정렬" #: libraries/DBQbe.class.php:511 msgid "Criteria" -msgstr "Criteria" +msgstr "조건" #: libraries/DBQbe.class.php:574 msgid "Add/Delete criteria rows" From fe741d85712e0a3af726212f2fb3b9f6ef6e81f0 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 24 Dec 2012 09:10:20 -0500 Subject: [PATCH 05/22] Add missing server parameter in the generated URL --- js/common.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/common.js b/js/common.js index a5801fc110..54ae5b8ed8 100644 --- a/js/common.js +++ b/js/common.js @@ -81,8 +81,9 @@ var PMA_commonParams = (function () { */ getUrlQuery: function () { return $.sprintf( - '?%s&db=%s&table=%s', + '?%s&server=%s&db=%s&table=%s', this.get('common_query'), + encodeURIComponent(this.get('server')), encodeURIComponent(this.get('db')), encodeURIComponent(this.get('table')) ); From 16da44b476457bdf5edf05504e96ce0214426767 Mon Sep 17 00:00:00 2001 From: Seongki Shin Date: Mon, 24 Dec 2012 09:13:01 +0100 Subject: [PATCH 06/22] Translated using Weblate (Korean) Currently translated at 33.9% (883 of 2601) --- po/ko.po | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/po/ko.po b/po/ko.po index ea09ff4752..f5455b29b5 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-12-22 13:22-0500\n" -"PO-Revision-Date: 2012-12-24 02:46+0200\n" -"Last-Translator: Deokyun Yu \n" +"PO-Revision-Date: 2012-12-24 09:13+0200\n" +"Last-Translator: Seongki Shin \n" "Language-Team: Korean \n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -777,9 +777,8 @@ msgid "Database client version" msgstr "데이터베이스 클라이언트 버전" #: index.php:280 -#, fuzzy msgid "PHP extension" -msgstr "PHP 버전" +msgstr "PHP 확장" #: index.php:294 msgid "Show PHP information" @@ -1859,11 +1858,11 @@ msgstr "선택/해제하려면 클릭하세요." #: js/messages.php:342 msgid "Double-click to copy column name" -msgstr "" +msgstr "칼럼명을 복사하려면 더블클릭하세요" #: js/messages.php:343 msgid "Click the drop-down arrow
to toggle column's visibility" -msgstr "" +msgstr "칼럼보이기를 토글하려면
드롭다운 화살표를 클릭하세요" #: js/messages.php:345 msgid "" From 8147de48e082ffa729c747106f5ef86c52ced472 Mon Sep 17 00:00:00 2001 From: karwan hidayat Date: Mon, 24 Dec 2012 08:51:40 +0100 Subject: [PATCH 07/22] Translated using Weblate (Kurdish Sorani) Currently translated at 21.3% (555 of 2601) --- po/ckb.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/po/ckb.po b/po/ckb.po index 643b271abb..d8370f3ba9 100644 --- a/po/ckb.po +++ b/po/ckb.po @@ -8,20 +8,21 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-12-22 13:22-0500\n" -"PO-Revision-Date: 2012-11-23 19:36+0200\n" -"Last-Translator: renwar kurd \n" -"Language-Team: Kurdish Sorani \n" +"PO-Revision-Date: 2012-12-24 08:51+0200\n" +"Last-Translator: karwan hidayat \n" +"Language-Team: Kurdish Sorani " +"\n" +"Language: ckb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ckb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Weblate 1.4-dev\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:344 #: libraries/DisplayResults.class.php:809 #: libraries/server_privileges.lib.php:2616 +#, fuzzy msgid "Show all" msgstr "هەمووی پێشاندە" From f2d767cbc7f724a96bf359309d2362682e48ff1d Mon Sep 17 00:00:00 2001 From: Victor Volkov Date: Tue, 25 Dec 2012 21:55:35 +0100 Subject: [PATCH 08/22] Translated using Weblate (Russian) Currently translated at 100.0% (2601 of 2601) --- po/ru.po | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/po/ru.po b/po/ru.po index 9f4ab008bd..f242d5824c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,14 +4,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-12-22 13:22-0500\n" -"PO-Revision-Date: 2012-12-13 12:58+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Russian \n" +"PO-Revision-Date: 2012-12-25 21:55+0200\n" +"Last-Translator: Victor Volkov \n" +"Language-Team: Russian " +"\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Weblate 1.4-dev\n" @@ -1858,7 +1858,7 @@ msgstr "Добавить параметр для столбца " #: js/messages.php:334 #, php-format msgid "%d object(s) created" -msgstr "" +msgstr "создано %d объект(ов)" #: js/messages.php:337 msgid "Press escape to cancel editing" @@ -1902,23 +1902,18 @@ msgstr "" "галочки, ссылки редактирования, копирования и удаления." #: js/messages.php:350 -#, fuzzy #| msgid "" #| "You can also edit most columns
by double-clicking directly on their " #| "content." msgid "You can also edit most values
by double-clicking directly on them." msgstr "" -"Большинство столбцов можно отредактировать
дважды кликнув прямо на их " -"содержимом." +"Большинство значений можно отредактировать
дважды кликнув прямо на них." #: js/messages.php:353 -#, fuzzy #| msgid "" #| "You can also edit most columns
by clicking directly on their content." msgid "You can also edit most values
by clicking directly on them." -msgstr "" -"Возможно редактировать большинство столбцов
кликнув прямо на их " -"содержимом." +msgstr "Возможно редактировать большинство значений
кликнув прямо на них." #: js/messages.php:358 msgid "Go to link" @@ -2785,7 +2780,7 @@ msgstr "Открыть phpMyAdmin в новом окне" #: libraries/Header.class.php:387 msgid "Click on the bar to scroll to top of page" -msgstr "" +msgstr "Кликните на строку, чтобы перейти вверх страницы" #: libraries/Header.class.php:593 #: libraries/plugins/auth/AuthenticationCookie.class.php:255 @@ -3897,7 +3892,7 @@ msgstr "Необходимо обновить %s до версии %s или в #: libraries/common.inc.php:1042 msgid "Error: Token mismatch" -msgstr "" +msgstr "Ошибка: Несоответствие Тоукена" #: libraries/common.inc.php:1086 msgid "GLOBALS overwrite attempt" @@ -10121,11 +10116,11 @@ msgstr "Показать/скрыть левое меню" #: pmd_general.php:86 msgid "View in fullscreen" -msgstr "" +msgstr "Отобразить в полном экране" #: pmd_general.php:90 msgid "Exit fullscreen" -msgstr "" +msgstr "Выйти из полноэкранного режима" #: pmd_general.php:95 msgid "Save position" @@ -12666,7 +12661,6 @@ msgid "log_slow_queries is set to 'OFF'" msgstr "Переменная log_slow_queries установлена в 'OFF'" #: libraries/advisory_rules.txt:95 -#, fuzzy #| msgid "" #| "Enable slow query logging by setting {log_slow_queries} to 'ON'. This " #| "will help troubleshooting badly performing queries." @@ -12675,14 +12669,13 @@ msgid "" "help troubleshooting badly performing queries." msgstr "" "Включите запись журналов медленных запросов установив переменную " -"{log_slow_queries} в 'ON'. Это поможет в поиске медленных, недостаточно " +"{slow_query_log} в 'ON'. Это поможет в поиске медленных, недостаточно " "оптимизированных запросов." #: libraries/advisory_rules.txt:96 -#, fuzzy #| msgid "log_slow_queries is set to 'OFF'" msgid "slow_query_log is set to 'OFF'" -msgstr "Переменная log_slow_queries установлена в 'OFF'" +msgstr "Переменная slow_query_log установлена в 'OFF'" #: libraries/advisory_rules.txt:100 msgid "Release Series" From 18d2463b4170cba3d686246bb57c8de23ff72bcf Mon Sep 17 00:00:00 2001 From: "J.M" Date: Thu, 27 Dec 2012 16:06:09 +0100 Subject: [PATCH 09/22] Show login link in error message on cookie or session expiry --- .../plugins/auth/AuthenticationCookie.class.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php index f9588b0977..833d4ad990 100644 --- a/libraries/plugins/auth/AuthenticationCookie.class.php +++ b/libraries/plugins/auth/AuthenticationCookie.class.php @@ -74,7 +74,18 @@ class AuthenticationCookie extends AuthenticationPlugin $response = PMA_Response::getInstance(); if ($response->isAjax()) { $response->isSuccess(false); + + $login_link = '

[ ' . + sprintf( + '%s', + $GLOBALS['cfg']['PmaAbsoluteUri'], + __('Log in')) . + ' ]'; + if (! empty($conn_error)) { + + $conn_error .= $login_link; + $response->addJSON( 'message', PMA_Message::error( @@ -85,7 +96,8 @@ class AuthenticationCookie extends AuthenticationPlugin $response->addJSON( 'message', PMA_Message::error( - __('Your session has expired. Please login again.') + __('Your session has expired. Please log in again.') . + $login_link ) ); } From d534987a6a393896947dfc988ec5a52ff831db82 Mon Sep 17 00:00:00 2001 From: seho yun Date: Thu, 27 Dec 2012 08:27:40 +0100 Subject: [PATCH 10/22] Translated using Weblate (Korean) Currently translated at 33.9% (883 of 2601) --- po/ko.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index f5455b29b5..0295e956f2 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-12-22 13:22-0500\n" -"PO-Revision-Date: 2012-12-24 09:13+0200\n" -"Last-Translator: Seongki Shin \n" +"PO-Revision-Date: 2012-12-27 08:27+0200\n" +"Last-Translator: seho yun \n" "Language-Team: Korean \n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -1756,7 +1756,7 @@ msgstr "포인트에 마우스를 올리면 라벨이 표시됩니다." #: js/messages.php:293 msgid "To zoom in, select a section of the plot with the mouse." -msgstr "확대하려면 선택한 플롯을 클릭하세요." +msgstr "확대하려면 마우스로 플롯의 한 영역을 선택하세요." #: js/messages.php:295 msgid "Click reset zoom button to come back to original state." From 65d2e0d53b65f59fcab51f41411b4718edba01c1 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 27 Dec 2012 17:30:37 +0100 Subject: [PATCH 11/22] Translated using Weblate (Sinhala) Currently translated at 79.6% (2070 of 2601) --- po/si.po | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/po/si.po b/po/si.po index 85c5fb5afe..00bbda2824 100644 --- a/po/si.po +++ b/po/si.po @@ -4,14 +4,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-12-22 13:22-0500\n" -"PO-Revision-Date: 2012-12-03 18:45+0200\n" +"PO-Revision-Date: 2012-12-27 17:30+0200\n" "Last-Translator: Madhura Jayaratne \n" -"Language-Team: Sinhala \n" +"Language-Team: Sinhala " +"\n" +"Language: si\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: si\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Weblate 1.4-dev\n" @@ -820,6 +820,8 @@ msgid "" "option is incompatible with phpMyAdmin and might cause some data to be " "corrupted!" msgstr "" +"ඔබගේ PHP වින්‍යාසයන් හි mbstring.func_overload සක්‍රීය කර ඇත. මෙම විකල්පය " +"phpMyAdmin සමඟ නොගැළපෙන අතර යම් දත්ත විනාශ වීමට හේතු විය හැකිය!" #: index.php:408 msgid "" @@ -827,6 +829,9 @@ msgid "" "multibyte charset. Without the mbstring extension phpMyAdmin is unable to " "split strings correctly and it may result in unexpected results." msgstr "" +"mbstring PHP දිගුව සොයාගැනීමට නොමැති අතර ඔබ බහු-බයිට අක්ෂර කට්ටලයක් භාවිතා " +"කරයි. mbstring දිගුව නොමැති ව phpMyAdmin හට නිවැරදිව පෙළ බෙදීමට නොහැකි අතර " +"මෙය බලාපොරොත්තු නොවන ප්‍රතිඵල ගෙන දිය හැක." #: index.php:419 msgid "" From 84f4f1a246cf107d74e7e62d25af6f884b712ba4 Mon Sep 17 00:00:00 2001 From: "J.M" Date: Thu, 27 Dec 2012 19:14:28 +0100 Subject: [PATCH 12/22] rfe #3542567 Accept IPv6 ranges and IPv6 CIDR notations in $cfg['Servers'][$i]['AllowDeny']['rules'] --- ChangeLog | 1 + doc/config.rst | 16 +++- doc/glossary.rst | 7 ++ libraries/ip_allow_deny.lib.php | 132 ++++++++++++++++++++++++++++++-- 4 files changed, 147 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index af5f9c87cd..70fbc634fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,6 +79,7 @@ VerboseMultiSubmit, ReplaceHelpImg + Patch #3597529 [status] Add raw value as title on server status page + Support MySQL 5.6 partitioning + Removed the AjaxEnable directive ++ rfe #3542567 Accept IPv6 ranges and IPv6 CIDR notations in $cfg['Servers'][$i]['AllowDeny']['rules'] 3.5.6.0 (not yet released) - bug #3593604 [status] Erroneous advisor rule diff --git a/doc/config.rst b/doc/config.rst index 6aa817e3e4..6460dbf57d 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -862,18 +862,26 @@ Server connection settings from all'`` if your rule order is set to ``'allow,deny'`` or ``'explicit'``. - For the :term:`IP` matching + For the :term:`IP address` matching system, the following work: - * ``xxx.xxx.xxx.xxx`` (an exact :term:`IP` address) - * ``xxx.xxx.xxx.[yyy-zzz]`` (an :term:`IP` address range) + * ``xxx.xxx.xxx.xxx`` (an exact :term:`IP address`) + * ``xxx.xxx.xxx.[yyy-zzz]`` (an :term:`IP address` range) * ``xxx.xxx.xxx.xxx/nn`` (CIDR, Classless Inter-Domain Routing type :term:`IP` addresses) But the following does not work: * ``xxx.xxx.xxx.xx[yyy-zzz]`` (partial :term:`IP` address range) - Also IPv6 addresses are not supported. + For :term:`IPv6` addresses, the following work: + + * ``xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx`` (an exact :term:`IPv6` address) + * ``xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:[yyyy-zzzz]`` (an :term:`IPv6` address range) + * ``xxxx:xxxx:xxxx:xxxx/nn`` (CIDR, Classless Inter-Domain Routing type :term:`IPv6` addresses) + + But the following does not work: + + * ``xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xx[yyy-zzz]`` (partial :term:`IPv6` address range) .. config:option:: $cfg['Servers'][$i]['DisableIS'] diff --git a/doc/glossary.rst b/doc/glossary.rst index da9a4c20df..d558b44059 100644 --- a/doc/glossary.rst +++ b/doc/glossary.rst @@ -161,6 +161,13 @@ From Wikipedia, the free encyclopedia .. seealso:: + IPv6 + IPv6 (Internet Protocol version 6) is the latest revision of the + Internet Protocol (:term:`IP`), designed to deal with the + long-anticipated problem of its precedessor IPv4 running out of addresses. + + .. seealso:: + ISAPI Internet Server Application Programming Interface is the API of Internet Information Services (IIS). diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index b62912c845..f253e37c15 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -4,8 +4,6 @@ * This library is used with the server IP allow/deny host authentication * feature * - * @todo Broken for IPv6 - * * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { @@ -51,6 +49,31 @@ function PMA_getIp() } // end of the 'PMA_getIp()' function +/** + * Matches for IPv4 or IPv6 addresses + * + * @param string $testRange string of IP range to match + * @param string $ipToTest string of IP to test against range + * + * @return boolean whether the IP mask matches + * + * @access public + */ +function PMA_ipMaskTest($testRange, $ipToTest) +{ + $result = true; + + if (strpos($testRange, ':') > -1 || strpos($ipToTest, ':') > -1) { + // assume IPv6 + $result = PMA_ipv6MaskTest($testRange, $ipToTest); + } else { + $result = PMA_ipv4MaskTest($testRange, $ipToTest); + } + + return $result; +} // end of the "PMA_ipMaskTest()" function + + /** * Based on IP Pattern Matcher * Originally by J.Adams @@ -68,11 +91,11 @@ function PMA_getIp() * @param string $testRange string of IP range to match * @param string $ipToTest string of IP to test against range * - * @return boolean always true + * @return boolean whether the IP mask matches * * @access public */ -function PMA_ipMaskTest($testRange, $ipToTest) +function PMA_ipv4MaskTest($testRange, $ipToTest) { $result = true; $match = preg_match( @@ -120,7 +143,106 @@ function PMA_ipMaskTest($testRange, $ipToTest) } //end if/else return $result; -} // end of the "PMA_IPMaskTest()" function +} // end of the "PMA_ipv4MaskTest()" function + + +/** + * IPv6 matcher + * CIDR section taken from http://stackoverflow.com/a/10086404 + * Modified for phpMyAdmin + * + * Matches: + * xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx (exact) + * xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:[yyyy-zzzz] (range, only at end of IP - no subnets) + * xxxx:xxxx:xxxx:xxxx/nn (CIDR) + * + * Does not match: + * xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xx[yyy-zzz] (range, partial octets not supported) + * + * @param string $test_range string of IP range to match + * @param string $ip_to_test string of IP to test against range + * + * @return boolean whether the IP mask matches + * + * @access public + */ +function PMA_ipv6MaskTest($test_range, $ip_to_test) +{ + $result = true; + + // convert to lowercase for easier comparison + $test_range = strtolower($test_range); + $ip_to_test = strtolower($ip_to_test); + + $is_cidr = strpos($test_range, '/') > -1; + $is_range = strpos($test_range, '[') > -1; + $is_single = ! $is_cidr && ! $is_range; + + $ip_hex = bin2hex(inet_pton($ip_to_test)); + + if ($is_single) { + $range_hex = bin2hex(inet_pton($test_range)); + $result = $ip_hex === $range_hex; + } elseif ($is_range) { + // what range do we operate on? + $range_match = array(); + if (preg_match('/\[([0-9a-f]+)\-([0-9a-f]+)\]/', $test_range, $range_match)) { + $range_start = $range_match[1]; + $range_end = $range_match[2]; + + // get the first and last allowed IPs + $first_ip = str_replace($range_match[0], $range_start, $test_range); + $first_hex = bin2hex(inet_pton($first_ip)); + $last_ip = str_replace($range_match[0], $range_end, $test_range); + $last_hex = bin2hex(inet_pton($last_ip)); + + // check if the IP to test is within the range + $result = ($ip_hex >= $first_hex && $ip_hex <= $last_hex); + } + } elseif ($is_cidr) { + // Split in address and prefix length + list($first_ip, $subnet) = explode('/', $test_range); + + // Parse the address into a binary string + $first_bin = inet_pton($first_ip); + $first_hex = bin2hex($first_bin); + + // Overwriting first address string to make sure notation is optimal + $first_ip = inet_ntop($first_bin); + + $flexbits = 128 - $subnet; + + // Build the hexadecimal string of the last address + $last_hex = $first_hex; + + $pos = 31; + while ($flexbits > 0) { + // Get the character at this position + $orig = substr($last_hex, $pos, 1); + + // Convert it to an integer + $origval = hexdec($orig); + + // OR it with (2^flexbits)-1, with flexbits limited to 4 at a time + $newval = $origval | (pow(2, min(4, $flexbits)) - 1); + + // Convert it back to a hexadecimal character + $new = dechex($newval); + + // And put that character back in the string + $last_hex = substr_replace($last_hex, $new, $pos, 1); + + // We processed one nibble, move to previous position + $flexbits -= 4; + $pos -= 1; + } + + // check if the IP to test is within the range + $result = ($ip_hex >= $first_hex && $ip_hex <= $last_hex); + } + + return $result; +} // end of the "PMA_ipv6MaskTest()" function /** From b606ed2329cc20f617a2b25495f5467691b1a9a0 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 27 Dec 2012 18:39:19 +0100 Subject: [PATCH 13/22] Translated using Weblate (Sinhala) Currently translated at 80.8% (2102 of 2601) --- po/si.po | 97 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 48 insertions(+), 49 deletions(-) diff --git a/po/si.po b/po/si.po index 00bbda2824..9138d537cb 100644 --- a/po/si.po +++ b/po/si.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-12-22 13:22-0500\n" -"PO-Revision-Date: 2012-12-27 17:30+0200\n" +"PO-Revision-Date: 2012-12-27 18:39+0200\n" "Last-Translator: Madhura Jayaratne \n" "Language-Team: Sinhala " "\n" @@ -840,16 +840,23 @@ msgid "" "cookie validity configured in phpMyAdmin, because of this, your login will " "expire sooner than configured in phpMyAdmin." msgstr "" +"ඔබගේ [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-" +"maxlifetime@_blank]session.gc_maxlifetime[/a] PHP පරාමිතිය phpMyAdmin හි " +"සිටුවා ඇති කුකී වලංගු කාලය ට වඩා අඩු අගයක් ගනී. මේ හේතුවෙන් ඔබගේ සැසිය " +"phpMyAdmin හි සිටුවා ඇති කාලයට පෙර කල් ඉකුත් විය හැක." #: index.php:431 msgid "" "Login cookie store is lower than cookie validity configured in phpMyAdmin, " "because of this, your login will expire sooner than configured in phpMyAdmin." msgstr "" +"ලොගින් කුකියේ වලංගු කාලය phpMyAdmin හි සිටුවා ඇති කුකී වලංගු කාලය ට වඩා අඩු " +"අගයක් ගනී. මේ හේතුවෙන් ඔබගේ සැසිය phpMyAdmin හි සිටුවා ඇති කාලයට පෙර කල් " +"ඉකුත් විය හැක." #: index.php:443 msgid "The configuration file now needs a secret passphrase (blowfish_secret)." -msgstr "" +msgstr "වින්‍යාස ගොනුවට දැන් රහස්‍ය වාක්‍ය ඛණ්ඩයක් (blowfish_secret) අවශ්‍යය." #: index.php:454 msgid "" @@ -857,6 +864,9 @@ msgid "" "exists in your phpMyAdmin directory. You should remove it once phpMyAdmin " "has been configured." msgstr "" +"පිහිටුවීමේ විධානාවලිය විසින් භාවිතා කරන [code]config[/code] ඩිරෙක්ටරිය තවමත් " +"ඔබගේ phpMyAdmin ඩිරෙක්ටරිය තුල ඇත. phpMyAdmin වින්‍යාස සකසා අවසන් වූ පසු ඔබ " +"එය ඉවත් කල යුතුය." #: index.php:464 #, php-format @@ -882,6 +892,8 @@ msgid "" "Server running with Suhosin. Please refer to %sdocumentation%s for possible " "issues." msgstr "" +"සේවාදායකය Suhosin සමග ක්‍රියාත්මකයි. මෙමගින් ඇති විය හැකි ගැටළු සම්බන්ධයෙන් " +"%sලියකියවිලි%s බලන්න." #: js/messages.php:27 libraries/import.lib.php:118 sql.php:337 msgid "\"DROP DATABASE\" statements are disabled." @@ -933,10 +945,10 @@ msgid "Edit Index" msgstr "සුචිය සංස්කරණය කරන්න" #: js/messages.php:44 tbl_indexes.php:326 tbl_indexes.php:334 -#, fuzzy, php-format +#, php-format #| msgid "Add %d column(s) to index" msgid "Add %s column(s) to index" -msgstr "සුචියට ක්ෂේත්‍ර %d ක් එක් කරන්න" +msgstr "සුචියට ක්ෂේත්‍ර %s ක් එක් කරන්න" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:48 @@ -1552,12 +1564,12 @@ msgstr "ඉල්ලීම පිරිසැකසීමේදී දෝශ ඇ #: js/messages.php:225 #, php-format msgid "Error code: %s" -msgstr "" +msgstr "දෝෂ කේතය: %s" #: js/messages.php:226 #, php-format msgid "Error text: %s" -msgstr "" +msgstr "දෝෂ පණිවුඩය: %s" #: js/messages.php:227 libraries/db_common.inc.php:58 #: libraries/db_table_exists.lib.php:28 server_databases.php:89 @@ -1815,7 +1827,7 @@ msgstr "ක්ෂේත්‍රයට අභිරුචියක් එක් #: js/messages.php:334 #, php-format msgid "%d object(s) created" -msgstr "" +msgstr "වස්තූන් %d ක් නිමැවිණි" #: js/messages.php:337 msgid "Press escape to cancel editing" @@ -1856,18 +1868,20 @@ msgstr "" "ඇඳීම් ක්‍රියා විරහිත වනු ඇත." #: js/messages.php:350 -#, fuzzy #| msgid "" #| "You can also edit most columns
by clicking directly on their content." msgid "You can also edit most values
by double-clicking directly on them." -msgstr "අන්තර්ගත දත්ත මත ක්ලික් කිරීමෙන් ඔබට
බොහෝ තීරවල අඩංගු දත්ත වෙනස් කල හැක." +msgstr "" +"අන්තර්ගත දත්ත මත ද්විත්ව-ක්ලික් කිරීමෙන් ඔබට
බොහෝ තීරවල අඩංගු දත්ත " +"වෙනස් කල හැක." #: js/messages.php:353 -#, fuzzy #| msgid "" #| "You can also edit most columns
by clicking directly on their content." msgid "You can also edit most values
by clicking directly on them." -msgstr "අන්තර්ගත දත්ත මත ක්ලික් කිරීමෙන් ඔබට
බොහෝ තීරවල අඩංගු දත්ත වෙනස් කල හැක." +msgstr "" +"අන්තර්ගත දත්ත මත ක්ලික් කිරීමෙන් ඔබට
බොහෝ තීරවල අඩංගු දත්ත වෙනස් කල " +"හැක." #: js/messages.php:358 msgid "Go to link" @@ -1902,22 +1916,19 @@ msgid "More" msgstr "තවත්" #: js/messages.php:372 -#, fuzzy #| msgid "Show all" msgid "Show Panel" -msgstr "සියල්ල පෙන්වන්න" +msgstr "පැනලය පෙන්වන්න" #: js/messages.php:373 -#, fuzzy #| msgid "Hide indexes" msgid "Hide Panel" -msgstr "සුචි සඟවන්න" +msgstr "පැනලය සඟවන්න" #: js/messages.php:376 -#, fuzzy #| msgid "The selected user was not found in the privilege table." msgid "The requested page was not found in the history, it may have expired." -msgstr "තෝරාගත් භාවිත කරන්නා වරප්‍රසාද වගුවේ හමු නොවිණි." +msgstr "ඔබ ඉල්ලු පිටුව ඉතිහාසයේ හමු නොවිණි, එය කල් ඉකුත් වී ඇතිවා විය හැකිය." #: js/messages.php:379 setup/lib/index.lib.php:188 #, php-format @@ -2719,7 +2730,7 @@ msgstr "නව phpMyAdmin කවුළුවක් විවෘත කරන් #: libraries/Header.class.php:387 msgid "Click on the bar to scroll to top of page" -msgstr "" +msgstr "පිටුව මුලට යාමට මෙය මත ක්ලික් කරන්න" #: libraries/Header.class.php:593 #: libraries/plugins/auth/AuthenticationCookie.class.php:255 @@ -3009,7 +3020,7 @@ msgstr "වගු" #: libraries/ServerStatusData.class.php:195 msgid "Transaction coordinator" -msgstr "" +msgstr "ගනුදෙනු සම්බන්ධීකාරක" #: libraries/ServerStatusData.class.php:196 server_binlog.php:107 msgid "Files" @@ -3802,7 +3813,7 @@ msgstr "ඔබ %s %s හෝ ඉන්පසු අනුවාදයක් ව #: libraries/common.inc.php:1042 msgid "Error: Token mismatch" -msgstr "" +msgstr "දෝෂය: ටෝකන නොගැලපීම" #: libraries/common.inc.php:1086 msgid "GLOBALS overwrite attempt" @@ -4570,16 +4581,14 @@ msgid "Databases display options" msgstr "දත්තගබඩා පෙන්වුම් විකල්ප" #: libraries/config/messages.inc.php:177 setup/frames/menu.inc.php:19 -#, fuzzy #| msgid "Navigation frame" msgid "Navigation panel" -msgstr "යාත්‍රණ රාමුව" +msgstr "යාත්‍රණ පැනලය" #: libraries/config/messages.inc.php:178 -#, fuzzy #| msgid "Customize appearance of the navigation frame" msgid "Customize appearance of the navigation panel" -msgstr "යාත්‍රණ රාමුවේ පෙනුම රිසි සේ සකසන්න" +msgstr "යාත්‍රණ පැනලයේ පෙනුම රිසි සේ සකසන්න" #: libraries/config/messages.inc.php:179 libraries/select_server.lib.php:42 #: setup/frames/index.inc.php:117 @@ -4595,10 +4604,9 @@ msgid "Tables display options" msgstr "ගොනු පෙන්වුම් විකල්ප" #: libraries/config/messages.inc.php:183 setup/frames/menu.inc.php:20 -#, fuzzy #| msgid "Main frame" msgid "Main panel" -msgstr "ප්‍රධාන රාමුව" +msgstr "ප්‍රධාන පැනලය" #: libraries/config/messages.inc.php:184 msgid "Microsoft Office" @@ -4708,16 +4716,14 @@ msgid "Customize import defaults" msgstr "ආනයන පෙරනිමි රිසි සේ සකසන්න" #: libraries/config/messages.inc.php:209 -#, fuzzy #| msgid "Customize navigation frame" msgid "Customize navigation panel" -msgstr "යාත්‍රණ රාමුව රිසි සේ සකසන්න" +msgstr "යාත්‍රණ පැනලය රිසි සේ සකසන්න" #: libraries/config/messages.inc.php:210 -#, fuzzy #| msgid "Customize main frame" msgid "Customize main panel" -msgstr "ප්‍රධාන රාමුව රිසි සේ සකසන්න" +msgstr "ප්‍රධාන පැනලය රිසි සේ සකසන්න" #: libraries/config/messages.inc.php:211 libraries/config/messages.inc.php:216 #: setup/frames/menu.inc.php:18 @@ -4984,10 +4990,9 @@ msgid "Users cannot set a higher value" msgstr "භාවිතා කරන්නන්ට වැඩි අගයක් සිටුවිය නොහැක" #: libraries/config/messages.inc.php:284 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Maximum number of databases displayed in database list" -msgstr "වගු ලයිස්තුවේ උපරිම ලෙස පෙන්විය යුතු වගු ගණන" +msgstr "දත්තගබඩා ලයිස්තුවේ උපරිම ලෙස පෙන්විය යුතු දත්තගබඩා ගණන" #: libraries/config/messages.inc.php:285 msgid "Maximum databases" @@ -4996,11 +5001,11 @@ msgstr "උපරිම දත්තගබඩා" #: libraries/config/messages.inc.php:286 msgid "" "The number of items that can be displayed on each page of the navigation tree" -msgstr "" +msgstr "යාත්‍රණ ගසෙහි එක පිටුවක පෙන්විය හැකි අයිතම ගණන" #: libraries/config/messages.inc.php:287 msgid "Maximum items in branch" -msgstr "" +msgstr "අත්තක උපරිම අයිතම ගණන" #: libraries/config/messages.inc.php:288 msgid "" @@ -5046,20 +5051,18 @@ msgid "Memory limit" msgstr "මතක සීමාව" #: libraries/config/messages.inc.php:297 -#, fuzzy #| msgid "Show logo in left frame" msgid "Show logo in navigation panel" -msgstr "වම්පස රාමුවේ ලාංඡනය පෙන්වන්න" +msgstr "යාත්‍රණ පැනලයේ ලාංඡනය පෙන්වන්න" #: libraries/config/messages.inc.php:298 msgid "Display logo" msgstr "ලාංඡනය පෙන්වන්න" #: libraries/config/messages.inc.php:299 -#, fuzzy #| msgid "URL where logo in the navigation frame will point to" msgid "URL where logo in the navigation panel will point to" -msgstr "යාත්‍රණ රාමුවේ දැක්වෙන ලාංඡනය සබැඳිය යුතු URL" +msgstr "යාත්‍රණ පැනලයේ දැක්වෙන ලාංඡනය සබැඳිය යුතු URL" #: libraries/config/messages.inc.php:300 msgid "Logo link URL" @@ -5078,10 +5081,9 @@ msgid "Logo link target" msgstr "ලාංඡනයේ සබැඳුම" #: libraries/config/messages.inc.php:303 -#, fuzzy #| msgid "Display server choice at the top of the left frame" msgid "Display server choice at the top of the navigation panel" -msgstr "සේවාදායක තේරීම වම්පස රාමුවේ ඉහල පෙන්වන්න" +msgstr "සේවාදායක තේරීම යාත්‍රණ පැනලයේ ඉහල පෙන්වන්න" #: libraries/config/messages.inc.php:304 msgid "Display servers selection" @@ -5092,38 +5094,35 @@ msgid "Target for quick access icon" msgstr "ක්ෂණික ප්‍රවේශය අයිකනය සඳහා ඉලක්කය" #: libraries/config/messages.inc.php:306 -#, fuzzy #| msgid "Minimum number of tables to display the table filter box" 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 -#, fuzzy #| msgid "Minimum number of tables to display the table filter box" 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 "දත්තගබඩා පෙරහන් කවුළුව පෙන්වීමට අවම වශයෙන් තිබිය යුතු දත්තගබඩා ගණන" #: libraries/config/messages.inc.php:309 -#, fuzzy #| msgid "" #| "Only light version; display databases in a tree (determined by the " #| "separator defined below)" 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" From aea70b093a62171e98ce9eceb08a820fa77f9a6f Mon Sep 17 00:00:00 2001 From: "J.M" Date: Thu, 27 Dec 2012 19:26:57 +0100 Subject: [PATCH 14/22] Update locale base strings for "..log in again", see issue #125 --- po/af.po | 2 +- po/ar.po | 2 +- po/az.po | 2 +- po/be.po | 2 +- po/be@latin.po | 2 +- po/bg.po | 2 +- po/bn.po | 2 +- po/br.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/ckb.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en_GB.po | 4 ++-- po/es.po | 2 +- po/et.po | 2 +- po/eu.po | 2 +- po/fa.po | 2 +- po/fi.po | 2 +- 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/hy.po | 2 +- po/id.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ka.po | 2 +- po/kk.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/pa.po | 2 +- po/phpmyadmin.pot | 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@latin.po | 2 +- po/sv.po | 2 +- po/ta.po | 2 +- po/te.po | 2 +- po/th.po | 2 +- po/tk.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@latin.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 70 files changed, 71 insertions(+), 71 deletions(-) diff --git a/po/af.po b/po/af.po index 2a1b94c58f..d27d4c8c17 100644 --- a/po/af.po +++ b/po/af.po @@ -7730,7 +7730,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/ar.po b/po/ar.po index 69c8dfee1f..868d8f77ec 100644 --- a/po/ar.po +++ b/po/ar.po @@ -7436,7 +7436,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "فشلت من إستعمال Blowfish من mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/az.po b/po/az.po index db0b0fbf35..1bb64d9865 100644 --- a/po/az.po +++ b/po/az.po @@ -7832,7 +7832,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/be.po b/po/be.po index 355a8fc4e3..5cbd14a4b8 100644 --- a/po/be.po +++ b/po/be.po @@ -8047,7 +8047,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/be@latin.po b/po/be@latin.po index 43255ae3cd..056406cac7 100644 --- a/po/be@latin.po +++ b/po/be@latin.po @@ -8040,7 +8040,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/bg.po b/po/bg.po index 62e895815f..97a3e23249 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7512,7 +7512,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Не може да се използва Blowfish от mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/bn.po b/po/bn.po index 7c91c763d6..7ba11d4ebb 100644 --- a/po/bn.po +++ b/po/bn.po @@ -7830,7 +7830,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/br.po b/po/br.po index 631105d213..310bf3c0de 100644 --- a/po/br.po +++ b/po/br.po @@ -7555,7 +7555,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/bs.po b/po/bs.po index c213923e7b..71542d2544 100644 --- a/po/bs.po +++ b/po/bs.po @@ -7826,7 +7826,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/ca.po b/po/ca.po index 339c17ae50..c317a4a750 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7843,7 +7843,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "No s'ha pogut utilitzar Blowfish de mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/ckb.po b/po/ckb.po index d8370f3ba9..fdf6f366d9 100644 --- a/po/ckb.po +++ b/po/ckb.po @@ -7306,7 +7306,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/cs.po b/po/cs.po index 1da24d254f..5c7e8918b7 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7656,7 +7656,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Při použití funkce Blowfish z knihovny mcrypt došlo k chybě!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "Vaše sezení vypršelo, prosím přihlaste se znovu." #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/cy.po b/po/cy.po index 9a30c9da8b..1e81e6ed87 100644 --- a/po/cy.po +++ b/po/cy.po @@ -7801,7 +7801,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/da.po b/po/da.po index bcc2f6ee3a..a236a05244 100644 --- a/po/da.po +++ b/po/da.po @@ -7707,7 +7707,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Kunne ikke bruge Blowfish fra mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "Din session er udløbet. Log venligst ind igen." #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/de.po b/po/de.po index f3810cbb6a..86967c6ae7 100644 --- a/po/de.po +++ b/po/de.po @@ -7798,7 +7798,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Benutzung von Blowfish des mcrypt-Pakets fehlgeschlagen!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "Ihre Sitzung ist abgelaufen. Bitte melden Sie sich erneut an." #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/el.po b/po/el.po index c96f8f8801..1aae6457e7 100644 --- a/po/el.po +++ b/po/el.po @@ -7782,7 +7782,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Αδύνατη η χρήση του Blowfish από το mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "Η συνεδρία σας έληξε. Συνδεθείτε ξανά." #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/en_GB.po b/po/en_GB.po index 91cd7b3d3a..cde3e70cb5 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7758,8 +7758,8 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Failed to use Blowfish from mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." -msgstr "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." +msgstr "Your session has expired. Please log in again." #: libraries/plugins/auth/AuthenticationCookie.class.php:177 msgid "Log in" diff --git a/po/es.po b/po/es.po index 8dc39b78f3..fe3d8752fd 100644 --- a/po/es.po +++ b/po/es.po @@ -7823,7 +7823,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "¡No se pudo utilizar Blowfish de la biblioteca mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "Su sesión expiró. Inicie sesión nuevamente." #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/et.po b/po/et.po index 58ce4d07c6..62ec1021a6 100644 --- a/po/et.po +++ b/po/et.po @@ -7791,7 +7791,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Failed to use Blowfish from mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/eu.po b/po/eu.po index dd7566bce3..a4ad525387 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7776,7 +7776,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/fa.po b/po/fa.po index 7f9d7410c4..694e68a879 100644 --- a/po/fa.po +++ b/po/fa.po @@ -7511,7 +7511,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "در استفاده از Blowfish از mcrypt موفق نشد!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/fi.po b/po/fi.po index c6865cef13..f0e51ad1c5 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7755,7 +7755,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Mcrypt-laajennuksen Blowfish-toiminnon käyttö epäonnistui!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/fr.po b/po/fr.po index 968f2fef8e..90fb0dd485 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7766,7 +7766,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Impossible d'utiliser Blowfish depuis mcrypt !" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "Votre session a expiré. Veuillez vous connecter à nouveau." #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/gl.po b/po/gl.po index 2039b3b83a..973b72e4b3 100644 --- a/po/gl.po +++ b/po/gl.po @@ -7838,7 +7838,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Non foi posíbel usar Blowfish desde mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/he.po b/po/he.po index cbb3cd754c..70f2ceef5a 100644 --- a/po/he.po +++ b/po/he.po @@ -7776,7 +7776,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/hi.po b/po/hi.po index acb640ac0c..beda3ef7ec 100644 --- a/po/hi.po +++ b/po/hi.po @@ -7767,7 +7767,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/hr.po b/po/hr.po index c28e0b5dbe..230e64be8d 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8050,7 +8050,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/hu.po b/po/hu.po index cf7acc4a51..8e89cb8bfc 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7737,7 +7737,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/hy.po b/po/hy.po index 897a75481c..bb5b9409a0 100644 --- a/po/hy.po +++ b/po/hy.po @@ -7263,7 +7263,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/id.po b/po/id.po index 7c6d0878f0..866a25c0ca 100644 --- a/po/id.po +++ b/po/id.po @@ -7650,7 +7650,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Gagal menggunakan Blowfish dari mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/it.po b/po/it.po index 22f9c19ea6..ec27d65d6e 100644 --- a/po/it.po +++ b/po/it.po @@ -7825,7 +7825,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Non riesco ad utilizzare Blowfish da mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/ja.po b/po/ja.po index a0579cae4e..7627dcf5dc 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7787,7 +7787,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "mcrypt から Blowfish を使おうとして失敗しました！" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/ka.po b/po/ka.po index 8f090b42f9..a643d13bad 100644 --- a/po/ka.po +++ b/po/ka.po @@ -8017,7 +8017,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/kk.po b/po/kk.po index 989cd4e7da..70fbe9c0c4 100644 --- a/po/kk.po +++ b/po/kk.po @@ -7305,7 +7305,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/ko.po b/po/ko.po index 0295e956f2..8d966af6d1 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7566,7 +7566,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/lt.po b/po/lt.po index 65439e62f6..f9dea3d9f4 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7741,7 +7741,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Nepavyko pasinaudoti Blowfish iš mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/lv.po b/po/lv.po index 0aca7b36f5..0b32b0217f 100644 --- a/po/lv.po +++ b/po/lv.po @@ -7739,7 +7739,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/mk.po b/po/mk.po index 012e1ff07a..56171ad8eb 100644 --- a/po/mk.po +++ b/po/mk.po @@ -7892,7 +7892,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/ml.po b/po/ml.po index cb75397b7d..c4ed0251a4 100644 --- a/po/ml.po +++ b/po/ml.po @@ -7277,7 +7277,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/mn.po b/po/mn.po index 6907e0e32a..f80c8d96c0 100644 --- a/po/mn.po +++ b/po/mn.po @@ -7906,7 +7906,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/ms.po b/po/ms.po index 0894b9a5c7..93f8ff19cd 100644 --- a/po/ms.po +++ b/po/ms.po @@ -7761,7 +7761,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/nb.po b/po/nb.po index c3d9bc9485..a7e9c28c2a 100644 --- a/po/nb.po +++ b/po/nb.po @@ -7784,7 +7784,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Kunne ikke bruke Blowfish fra mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/nl.po b/po/nl.po index 4f5ca6e972..e5b62c73ea 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7749,7 +7749,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Gebruik van Blowfish van mcrypt is niet gelukt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/pa.po b/po/pa.po index 3a73dbd940..88b554a172 100644 --- a/po/pa.po +++ b/po/pa.po @@ -7266,7 +7266,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot index 5a887b653d..67f6171f08 100644 --- a/po/phpmyadmin.pot +++ b/po/phpmyadmin.pot @@ -7262,7 +7262,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/pl.po b/po/pl.po index 0a7ce32b4a..64d1855706 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7878,7 +7878,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Nie można używać Blowfish z mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/pt.po b/po/pt.po index b07fd40875..6a3fb5bd41 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7742,7 +7742,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Falha ao usar Blowfish de mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/pt_BR.po b/po/pt_BR.po index 3b1ba2bfd2..a2daf399dc 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7748,7 +7748,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Falha ao usar Blowfish de mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "Sua sessão expirou. Por favor, faça login novamente." #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/ro.po b/po/ro.po index c0f3018457..48207d1587 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8138,7 +8138,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/ru.po b/po/ru.po index f242d5824c..8965a5583d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7768,7 +7768,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Невозможно использование Blowfish из mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "Время сессии истекло. Пожалуйста, войдите заново." #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/si.po b/po/si.po index 9138d537cb..dd2be6be68 100644 --- a/po/si.po +++ b/po/si.po @@ -7607,7 +7607,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "mcrypt හි Blowfish භාවිතා කිරීම අසමත් විය!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "ඔබගේ සැසිය කල් ඉකුත් වී ඇත. නැවත ඇතුළු වන්න." #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/sk.po b/po/sk.po index 6551a7b1b4..2dafb84054 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7706,7 +7706,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Pri použití funkcie Blowfish z knižnice mcrypt došlo k chybe!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/sl.po b/po/sl.po index e211d039c4..2ab1d6bffb 100644 --- a/po/sl.po +++ b/po/sl.po @@ -7724,7 +7724,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Uporaba Blowfish iz mcrypt je spodletela!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "Vaša seja je potekla. Prosimo, prijavite se znova." #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/sq.po b/po/sq.po index 7c133a71da..fb1ac42e25 100644 --- a/po/sq.po +++ b/po/sq.po @@ -7595,7 +7595,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/sr.po b/po/sr.po index b43726d3f4..beaf4ddb6e 100644 --- a/po/sr.po +++ b/po/sr.po @@ -7984,7 +7984,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/sr@latin.po b/po/sr@latin.po index 0c7537d5a1..3030eeb56f 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -7567,7 +7567,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Pokušaj upotrebe Blowfish algoritma iz mcrypt nije uspela!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/sv.po b/po/sv.po index b09e6cdcc4..20e3647eca 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7702,7 +7702,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Misslyckades med att använda Blowfish från mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "Din session har gått ut. Vänligen logga in igen." #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/ta.po b/po/ta.po index c3d99d2358..916e1b0287 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7412,7 +7412,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/te.po b/po/te.po index 267e15c86e..6c879931b7 100644 --- a/po/te.po +++ b/po/te.po @@ -7579,7 +7579,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/th.po b/po/th.po index 563286abaf..5bce082cb9 100644 --- a/po/th.po +++ b/po/th.po @@ -7609,7 +7609,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/tk.po b/po/tk.po index e785caf944..8aa4ad1675 100644 --- a/po/tk.po +++ b/po/tk.po @@ -7273,7 +7273,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/tr.po b/po/tr.po index af558583bd..3a8de4f015 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7729,7 +7729,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "mcrypt'tan Blowfish kullanmak başarısız!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "Oturumunuzun süresi doldu. Lütfen tekrar oturum açın." #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/tt.po b/po/tt.po index f6aa846d83..7411a71507 100644 --- a/po/tt.po +++ b/po/tt.po @@ -7916,7 +7916,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/ug.po b/po/ug.po index aac13dd205..c127ab9a53 100644 --- a/po/ug.po +++ b/po/ug.po @@ -7664,7 +7664,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/uk.po b/po/uk.po index e295ef7e4a..6763f03701 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7711,7 +7711,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "Не вдалося використати Blowfish із Mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/ur.po b/po/ur.po index 02b3040ff2..fd6e19344f 100644 --- a/po/ur.po +++ b/po/ur.po @@ -7822,7 +7822,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/uz.po b/po/uz.po index 9c35c83a45..3e5fb23f98 100644 --- a/po/uz.po +++ b/po/uz.po @@ -8355,7 +8355,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/uz@latin.po b/po/uz@latin.po index 3f1746b4ee..bfbf657129 100644 --- a/po/uz@latin.po +++ b/po/uz@latin.po @@ -8381,7 +8381,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/zh_CN.po b/po/zh_CN.po index 4655907afa..b252df74f4 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7570,7 +7570,7 @@ msgid "Failed to use Blowfish from mcrypt!" msgstr "使用 mcrypt 进行 Blowfish 失败！" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 diff --git a/po/zh_TW.po b/po/zh_TW.po index aa9f79d6ec..5a7287ce59 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7580,7 +7580,7 @@ msgstr "" "tools/phpmyadmin-blowfish-secret-generator\" target=\"_blank\">參考資料）" #: libraries/plugins/auth/AuthenticationCookie.class.php:88 -msgid "Your session has expired. Please login again." +msgid "Your session has expired. Please log in again." msgstr "" #: libraries/plugins/auth/AuthenticationCookie.class.php:177 From 49771711fe4d55a683e18e852a460a7bcd0bd351 Mon Sep 17 00:00:00 2001 From: "J.M" Date: Thu, 27 Dec 2012 19:32:35 +0100 Subject: [PATCH 15/22] After session expiry and re-login, bring user back to the page they were on. See issue #125 --- js/functions.js | 8 ++++++++ libraries/plugins/auth/AuthenticationCookie.class.php | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/js/functions.js b/js/functions.js index 86a8ee01d7..923dd03d30 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3776,6 +3776,14 @@ AJAX.registerOnload('functions.js', function () { } }); +/** + * When user gets an ajax session expiry message, we show a login link + */ +$('a.login-link').live('click', function(e) { + e.preventDefault(); + window.location.reload(true); +}); + /** * jQuery coding for 'Change Table' and 'Add Column'. Used on tbl_structure.php * * Attach Ajax Event handlers for Change Table diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php index 833d4ad990..d3aa269449 100644 --- a/libraries/plugins/auth/AuthenticationCookie.class.php +++ b/libraries/plugins/auth/AuthenticationCookie.class.php @@ -77,7 +77,7 @@ class AuthenticationCookie extends AuthenticationPlugin $login_link = '

[ ' . sprintf( - '%s', + '', $GLOBALS['cfg']['PmaAbsoluteUri'], __('Log in')) . ' ]'; From 4bbfb292e56bba82c5fd1d894c63e099c89656d1 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Thu, 27 Dec 2012 16:31:46 -0500 Subject: [PATCH 16/22] Bug #3598021 Dropping table does not reload main panel --- js/common.js | 5 ++++- js/functions.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/js/common.js b/js/common.js index 54ae5b8ed8..c4f4bab7ef 100644 --- a/js/common.js +++ b/js/common.js @@ -142,7 +142,10 @@ var PMA_commonActions = { url = url.substring(0, url.indexOf('?')); } url += PMA_commonParams.getUrlQuery(); - $('', {href: url}).click(); + $('', {href: url}) + .appendTo('body') + .click() + .remove(); AJAX._callback = callback; } }; diff --git a/js/functions.js b/js/functions.js index 923dd03d30..54aca0f855 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3311,7 +3311,7 @@ AJAX.registerOnload('functions.js', function() { PMA_reloadNavigation(); PMA_commonParams.set('table', ''); PMA_commonActions.refreshMain( - PMA_commonParams.get('opendb_url'), + 'db_structure.php', function () { PMA_ajaxShowMessage(data.message); } From dc0c63ebaae9ec7dd5122058011f191c6375560b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 27 Dec 2012 17:20:52 -0500 Subject: [PATCH 17/22] Bug #3598022 Renaming table does not switch to new table --- js/functions.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/js/functions.js b/js/functions.js index 54aca0f855..5338a66266 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2159,10 +2159,8 @@ AJAX.registerOnload('functions.js', function() { $.post($form.attr('action'), $form.serialize(), function(data) { if (data.success == true) { PMA_commonParams.set('table', tbl); - $('#page_content').replaceWith( - "
" + data.message + "
" - ); - $('html, body').animate({scrollTop: 0}, 'fast'); + // @toto: somehow show the generated sql query + PMA_commonActions.refreshMain(); } else { PMA_ajaxShowMessage(data.error, false); } From 432eb5b2b4eb0147413594f01f3b3d38d2b5b942 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 27 Dec 2012 17:28:25 -0500 Subject: [PATCH 18/22] Bug #3598020 Dropping database does not end; it seems interesting to go back to the list of databases after dropping one --- js/functions.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/js/functions.js b/js/functions.js index 5338a66266..3059de37c4 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2239,9 +2239,12 @@ AJAX.registerOnload('functions.js', function() { //Database deleted successfully, refresh both the frames PMA_reloadNavigation(); PMA_commonParams.set('db', ''); - PMA_commonActions.refreshMain('index.php', function () { - PMA_ajaxShowMessage(data.message); - }); + PMA_commonActions.refreshMain( + 'server_databases.php', + function () { + PMA_ajaxShowMessage(data.message); + } + ); } else { PMA_ajaxShowMessage(data.error, false); } From 9d456fdbd264f4015d8bfe04faa5d76819aa774e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 28 Dec 2012 07:06:56 -0500 Subject: [PATCH 19/22] Fix typo --- js/functions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/functions.js b/js/functions.js index 3059de37c4..fa1d3e5f87 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2159,7 +2159,7 @@ AJAX.registerOnload('functions.js', function() { $.post($form.attr('action'), $form.serialize(), function(data) { if (data.success == true) { PMA_commonParams.set('table', tbl); - // @toto: somehow show the generated sql query + // @todo: somehow show the generated sql query PMA_commonActions.refreshMain(); } else { PMA_ajaxShowMessage(data.error, false); From 2e2c313b2f2422c6ec206305ad7ca9f15ccdfe3b Mon Sep 17 00:00:00 2001 From: kenny park Date: Fri, 28 Dec 2012 09:53:17 +0100 Subject: [PATCH 20/22] Translated using Weblate (Korean) Currently translated at 34.1% (886 of 2601) --- po/ko.po | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/po/ko.po b/po/ko.po index 8d966af6d1..30b541f894 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-12-22 13:22-0500\n" -"PO-Revision-Date: 2012-12-27 08:27+0200\n" -"Last-Translator: seho yun \n" +"PO-Revision-Date: 2012-12-28 09:53+0200\n" +"Last-Translator: kenny park \n" "Language-Team: Korean \n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -13109,11 +13109,13 @@ msgid "" "MySQL properly. This can be due to network issues or code not closing a " "database handler properly. Check your network and code." msgstr "" +"MySQL 커넥션을 확실히 닫아주지 않으면 다음 접속시 거부당할 수 있습니다. 네트웍 문제이거나 코드상에서의 DB 핸들러가 적절하게 " +"연결을 닫아주지 않아서 이런 문제가 발생합니다. 네트웍 상태와 소스 코드를 확인해보세요." #: libraries/advisory_rules.txt:418 #, php-format msgid "%s%% of all clients are aborted. This value should be below 2%%" -msgstr "" +msgstr "%s%% 의 연결이 모두 거부당했습니다. 값을 2%% 이하로 설정해보세요." #: libraries/advisory_rules.txt:420 #, fuzzy @@ -13123,7 +13125,7 @@ msgstr "테이블 설명" #: libraries/advisory_rules.txt:425 #, php-format msgid "Aborted client rate is at %s, this value should be less than 1 per hour" -msgstr "" +msgstr "접속 실패율이 %s 입니다. 이 값은 시간당 1이하로 설정해줘야 합니다." #: libraries/advisory_rules.txt:429 msgid "Is InnoDB disabled?" From cebf80da37c16c0d41b7b8b8de6eb671189c6886 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 28 Dec 2012 07:13:47 -0500 Subject: [PATCH 21/22] Put back previous code that uses the content of DefaultTabDatabase --- js/functions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/functions.js b/js/functions.js index fa1d3e5f87..5710ae1982 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3312,7 +3312,7 @@ AJAX.registerOnload('functions.js', function() { PMA_reloadNavigation(); PMA_commonParams.set('table', ''); PMA_commonActions.refreshMain( - 'db_structure.php', + PMA_commonParams.get('opendb_url'), function () { PMA_ajaxShowMessage(data.message); } From b7feced1000506cd1c87a13e370f68c75e5ae0a0 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 28 Dec 2012 07:55:21 -0500 Subject: [PATCH 22/22] Bug #3597900 Create table page gives errors like unknown table status --- libraries/Table.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 8433b4c753..70cf694139 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -556,7 +556,9 @@ class PMA_Table } } } - PMA_Table::$cache[$db][$table]['ExactRows'] = $row_count; + if ($row_count) { + PMA_Table::$cache[$db][$table]['ExactRows'] = $row_count; + } } }