The branch, master has been updated via aeb14a271ab439b0f62940049aa07edf1240f46b (commit) via 4fb2f7a2330e5d402dec60328941d07b0685a792 (commit) via 3526b4fa8a65f6b3b3ef71495fa63d47077b6166 (commit) via 898d7def27edfed7ba5498793ef5e008a2345f4a (commit) via f3eb5bafce1a4d55aa96b7703a22b5001627e6f1 (commit) via fb2a4eee51631e95babafa9a1de987b09e8d5192 (commit) via ed69959f77a11c7cc39e9a9a2b1ea406181fb46f (commit) via 5b963d0e90806dbfdbdfd8e91bb96bccb9fd697e (commit) via 86f77765a8bee944e61abdf24ac88fec1862047a (commit) via c6f039b0a1073208fc0327b176e9d8a451f985fb (commit) via 7a6cf32ffd9236d6f26329752a48a04a3880f632 (commit) via f04a74a95cc43d2836f2ea0f0cbea1167e674745 (commit) via 53eda16b4b6c59f8b96ebed8d99849dcd6c409d6 (commit) via 068cb44ff1b686b788dd652c21b024239030f18e (commit) via fc2e0be48cc21e962b3e61dbe7b8bb4fbdfdf6a3 (commit) via c6b3ce8ff5028093bac6d8cb0e8d845df3cc137b (commit) via 12308500460f7dc090497d3230f9c1231135c304 (commit) via 4a182dc6749a8a850b0ce155a50aed9e615f0440 (commit) via 3970e0e9f0df8a1e83d8c086d1b5a3887be68403 (commit) via 183aea41fa2e34bd0df5d141054d67f06d9c5a42 (commit) via 1153e5c8151c072340dd25f83cdf9f3cc3796e50 (commit) via 1f46429a7c72620ac3c1a028836213fe36f974b6 (commit) via 9aabf7218885674b53ef82786291b563d0e0f8ac (commit) via 7345aba6887c8fc9a502bfb1c57c52781dd60977 (commit) via ca09bca158b3a0110ea74d5ee56be0141c86fc58 (commit) via c3ca56484891152bc318887a16fa55c02a667313 (commit) via f2797c359adc15a605233ea0c543b8586331d6b3 (commit) via d1f6d7d0d353796a89f6f71e62dcc3a09f46fd8a (commit) via 8ee52737180b50125c163d0890f4fc836e06cd8b (commit) via b2ff619af9b5bde30aeceeacdb2a315e9a33957f (commit) via d7bbfd0d2310e85395a917377735077e8618d839 (commit) via 9aa858202308e06fd1a217ed3225a603b56365b0 (commit) via 088ea8c50474a7b72287e45c7908ac92db1e44f1 (commit) via 177c6a68fcf5583bffc8e2bb5a801c703acc23f1 (commit) via f892819cb1c3fc3eec47ce628dcaa08b32c60ca8 (commit) via f88f8ccea6a6a9ca129708fb75379b1ef9f2c444 (commit) via 7f73b8310b0c09aa67f6cfe670d0d6c3c01e4021 (commit) via 61d4fcc4d0e6660466b6273d7022b39f0aef8f7f (commit) via 54f10e3ce85381b18ba257fed44df907445682e4 (commit) via 8cc722e9cb43921d07aaa7179fcd7977ac54dfd8 (commit) via a431ec588926af3534d3297237946d175878ae8b (commit) via 6a52b935ba026a630da038404093fd240a5c7e8a (commit) via 9b0ecd4fc48069d0c2784a0f6d60d889ad936dc1 (commit) via 6e4ca526ded3dadd6b8b5be0077c628d0d8adcd3 (commit) via 48fef99b78b1d71a16c73c2910ec45ea5de58714 (commit) via 6640578b847d5ca4abee9ee6c414643fc147cb25 (commit) via 380a4d54daec740147286af6110ba454b1f2c06b (commit) via 7defef3d6bf2472a8f96652a8472b3d092e7d026 (commit) via 5d7f5d0bcf3f300c0b8ed9f103a1795d18329e1b (commit) via b35f6e0787dc18ace3bf1f83bec53b94d19a28aa (commit) via 90cac014aea6bbab502c772804fe019125bf37e0 (commit) via 61afb5f720f63788de40abe5b8db871586b92f9c (commit) via 20c877debdd4b75efff87b0d762f2f8d202c1dda (commit) via 47799a27336f9cdc6ad3cd7471d6d0b3f47d63cf (commit) via ac1fb07f0469aa031aeea189b6f3c83d788ea14e (commit) via 3926f039167b9f5435eb8365b84930040810491a (commit) via c0635c23bc6ec87d9ff2cbdd888ed0173f1063f6 (commit) via 16c5db5044dada8d4bf7d92a140b191f0067a53d (commit) from f50d6694e79bb1f8268e44123e8b6935f10a365a (commit)
- Log ----------------------------------------------------------------- commit aeb14a271ab439b0f62940049aa07edf1240f46b Merge: f50d6694e79bb1f8268e44123e8b6935f10a365a 4fb2f7a2330e5d402dec60328941d07b0685a792 Author: Michal Čihař michal@cihar.com Date: Sat Jun 5 21:42:42 2010 +0200
Merge remote branch 'pootle/master'
Conflicts: po/en_GB.po po/sl.po
commit 4fb2f7a2330e5d402dec60328941d07b0685a792 Author: Domen dbc334@gmail.com Date: Fri Jun 4 23:39:18 2010 +0200
Translation update done using Pootle.
commit 3526b4fa8a65f6b3b3ef71495fa63d47077b6166 Author: Domen dbc334@gmail.com Date: Fri Jun 4 23:36:20 2010 +0200
Translation update done using Pootle.
commit 898d7def27edfed7ba5498793ef5e008a2345f4a Author: Domen dbc334@gmail.com Date: Fri Jun 4 23:29:17 2010 +0200
Translation update done using Pootle.
commit f3eb5bafce1a4d55aa96b7703a22b5001627e6f1 Author: Domen dbc334@gmail.com Date: Fri Jun 4 23:27:55 2010 +0200
Translation update done using Pootle.
commit fb2a4eee51631e95babafa9a1de987b09e8d5192 Author: Domen dbc334@gmail.com Date: Fri Jun 4 23:25:11 2010 +0200
Translation update done using Pootle.
commit ed69959f77a11c7cc39e9a9a2b1ea406181fb46f Author: Domen dbc334@gmail.com Date: Fri Jun 4 23:25:00 2010 +0200
Translation update done using Pootle.
commit 5b963d0e90806dbfdbdfd8e91bb96bccb9fd697e Author: Domen dbc334@gmail.com Date: Fri Jun 4 23:23:12 2010 +0200
Translation update done using Pootle.
commit 86f77765a8bee944e61abdf24ac88fec1862047a Author: Domen dbc334@gmail.com Date: Fri Jun 4 23:21:30 2010 +0200
Translation update done using Pootle.
commit c6f039b0a1073208fc0327b176e9d8a451f985fb Author: Domen dbc334@gmail.com Date: Fri Jun 4 23:18:38 2010 +0200
Translation update done using Pootle.
commit 7a6cf32ffd9236d6f26329752a48a04a3880f632 Author: Domen dbc334@gmail.com Date: Fri Jun 4 23:14:30 2010 +0200
Translation update done using Pootle.
commit f04a74a95cc43d2836f2ea0f0cbea1167e674745 Author: Domen dbc334@gmail.com Date: Fri Jun 4 23:12:25 2010 +0200
Translation update done using Pootle.
commit 53eda16b4b6c59f8b96ebed8d99849dcd6c409d6 Author: Domen dbc334@gmail.com Date: Fri Jun 4 23:11:13 2010 +0200
Translation update done using Pootle.
commit 068cb44ff1b686b788dd652c21b024239030f18e Author: Domen dbc334@gmail.com Date: Fri Jun 4 23:10:32 2010 +0200
Translation update done using Pootle.
commit fc2e0be48cc21e962b3e61dbe7b8bb4fbdfdf6a3 Author: Domen dbc334@gmail.com Date: Fri Jun 4 23:06:18 2010 +0200
Translation update done using Pootle.
commit c6b3ce8ff5028093bac6d8cb0e8d845df3cc137b Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 22:01:58 2010 +0200
Translation update done using Pootle.
commit 12308500460f7dc090497d3230f9c1231135c304 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 22:01:35 2010 +0200
Translation update done using Pootle.
commit 4a182dc6749a8a850b0ce155a50aed9e615f0440 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 22:01:18 2010 +0200
Translation update done using Pootle.
commit 3970e0e9f0df8a1e83d8c086d1b5a3887be68403 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 22:01:05 2010 +0200
Translation update done using Pootle.
commit 183aea41fa2e34bd0df5d141054d67f06d9c5a42 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 22:00:52 2010 +0200
Translation update done using Pootle.
commit 1153e5c8151c072340dd25f83cdf9f3cc3796e50 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 22:00:21 2010 +0200
Translation update done using Pootle.
commit 1f46429a7c72620ac3c1a028836213fe36f974b6 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:58:54 2010 +0200
Translation update done using Pootle.
commit 9aabf7218885674b53ef82786291b563d0e0f8ac Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:58:37 2010 +0200
Translation update done using Pootle.
commit 7345aba6887c8fc9a502bfb1c57c52781dd60977 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:58:29 2010 +0200
Translation update done using Pootle.
commit ca09bca158b3a0110ea74d5ee56be0141c86fc58 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:58:17 2010 +0200
Translation update done using Pootle.
commit c3ca56484891152bc318887a16fa55c02a667313 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:57:55 2010 +0200
Translation update done using Pootle.
commit f2797c359adc15a605233ea0c543b8586331d6b3 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:57:41 2010 +0200
Translation update done using Pootle.
commit d1f6d7d0d353796a89f6f71e62dcc3a09f46fd8a Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:57:16 2010 +0200
Translation update done using Pootle.
commit 8ee52737180b50125c163d0890f4fc836e06cd8b Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:56:39 2010 +0200
Translation update done using Pootle.
commit b2ff619af9b5bde30aeceeacdb2a315e9a33957f Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:56:30 2010 +0200
Translation update done using Pootle.
commit d7bbfd0d2310e85395a917377735077e8618d839 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:56:17 2010 +0200
Translation update done using Pootle.
commit 9aa858202308e06fd1a217ed3225a603b56365b0 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:56:01 2010 +0200
Translation update done using Pootle.
commit 088ea8c50474a7b72287e45c7908ac92db1e44f1 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:55:44 2010 +0200
Translation update done using Pootle.
commit 177c6a68fcf5583bffc8e2bb5a801c703acc23f1 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:55:23 2010 +0200
Translation update done using Pootle.
commit f892819cb1c3fc3eec47ce628dcaa08b32c60ca8 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:54:37 2010 +0200
Translation update done using Pootle.
commit f88f8ccea6a6a9ca129708fb75379b1ef9f2c444 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:54:14 2010 +0200
Translation update done using Pootle.
commit 7f73b8310b0c09aa67f6cfe670d0d6c3c01e4021 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:53:47 2010 +0200
Translation update done using Pootle.
commit 61d4fcc4d0e6660466b6273d7022b39f0aef8f7f Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:53:31 2010 +0200
Translation update done using Pootle.
commit 54f10e3ce85381b18ba257fed44df907445682e4 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:53:21 2010 +0200
Translation update done using Pootle.
commit 8cc722e9cb43921d07aaa7179fcd7977ac54dfd8 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:52:58 2010 +0200
Translation update done using Pootle.
commit a431ec588926af3534d3297237946d175878ae8b Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:52:49 2010 +0200
Translation update done using Pootle.
commit 6a52b935ba026a630da038404093fd240a5c7e8a Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:52:35 2010 +0200
Translation update done using Pootle.
commit 9b0ecd4fc48069d0c2784a0f6d60d889ad936dc1 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:52:21 2010 +0200
Translation update done using Pootle.
commit 6e4ca526ded3dadd6b8b5be0077c628d0d8adcd3 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:52:08 2010 +0200
Translation update done using Pootle.
commit 48fef99b78b1d71a16c73c2910ec45ea5de58714 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:51:59 2010 +0200
Translation update done using Pootle.
commit 6640578b847d5ca4abee9ee6c414643fc147cb25 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:51:49 2010 +0200
Translation update done using Pootle.
commit 380a4d54daec740147286af6110ba454b1f2c06b Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:51:22 2010 +0200
Translation update done using Pootle.
commit 7defef3d6bf2472a8f96652a8472b3d092e7d026 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:51:12 2010 +0200
Translation update done using Pootle.
commit 5d7f5d0bcf3f300c0b8ed9f103a1795d18329e1b Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:51:01 2010 +0200
Translation update done using Pootle.
commit b35f6e0787dc18ace3bf1f83bec53b94d19a28aa Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:50:50 2010 +0200
Translation update done using Pootle.
commit 90cac014aea6bbab502c772804fe019125bf37e0 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:50:34 2010 +0200
Translation update done using Pootle.
commit 61afb5f720f63788de40abe5b8db871586b92f9c Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:50:15 2010 +0200
Translation update done using Pootle.
commit 20c877debdd4b75efff87b0d762f2f8d202c1dda Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:50:06 2010 +0200
Translation update done using Pootle.
commit 47799a27336f9cdc6ad3cd7471d6d0b3f47d63cf Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:49:54 2010 +0200
Translation update done using Pootle.
commit ac1fb07f0469aa031aeea189b6f3c83d788ea14e Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:49:40 2010 +0200
Translation update done using Pootle.
commit 3926f039167b9f5435eb8365b84930040810491a Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:49:27 2010 +0200
Translation update done using Pootle.
commit c0635c23bc6ec87d9ff2cbdd888ed0173f1063f6 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:49:17 2010 +0200
Translation update done using Pootle.
commit 16c5db5044dada8d4bf7d92a140b191f0067a53d Author: Marc Delisle marc@infomarc.info Date: Fri Jun 4 21:49:02 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/en_GB.po | 183 +++++++++++++++++++++++------------------------------------ po/sl.po | 37 ++++++++++++- 2 files changed, 107 insertions(+), 113 deletions(-)
diff --git a/po/en_GB.po b/po/en_GB.po index 9572a94..e12821d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-04 16:07-0400\n" -"PO-Revision-Date: 2010-05-25 16:41+0200\n" +"PO-Revision-Date: 2010-06-04 22:01+0200\n" "Last-Translator: Michal michal@cihar.com\n" "Language-Team: english-gb en_GB@li.org\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n"
@@ -111,10 +111,9 @@ msgstr "Table comments" #: tbl_indexes.php:189 tbl_printview.php:142 tbl_relation.php:402 #: tbl_select.php:135 tbl_structure.php:177 tbl_tracking.php:273 #: tbl_tracking.php:324 -#, fuzzy #| msgid "Column names" msgid "Column" -msgstr "Column names" +msgstr "Column"
#: db_datadict.php:175 db_printview.php:106 libraries/Index.class.php:443 #: libraries/db_events.inc.php:31 libraries/db_routines.inc.php:42 @@ -448,16 +447,14 @@ msgid "Modify" msgstr "Modify"
#: db_qbe.php:584 -#, fuzzy #| msgid "Add/Delete Criteria Row" msgid "Add/Delete criteria rows" -msgstr "Add/Delete Criteria Row" +msgstr "Add/Delete criteria rows"
#: db_qbe.php:596 -#, fuzzy #| msgid "Add/Delete Field Columns" msgid "Add/Delete columns" -msgstr "Add/Delete Field Columns" +msgstr "Add/Delete columns"
#: db_qbe.php:609 db_qbe.php:634 msgid "Update Query" @@ -551,10 +548,9 @@ msgid "Inside table(s):" msgstr "Inside table(s):"
#: db_search.php:355 -#, fuzzy #| msgid "Inside field:" msgid "Inside column:" -msgstr "Inside field:" +msgstr "Inside column:"
#: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 @@ -1000,10 +996,9 @@ msgid "Please select the primary key or a unique key" msgstr "Please select the primary key or a unique key"
#: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 -#, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" -msgstr "Choose field to display" +msgstr "Choose column to display"
#. l10n: Display text for calendar close link #: js/messages.php:73 @@ -1977,10 +1972,9 @@ msgid "No Privileges" msgstr "No Privileges"
#: libraries/display_create_table.lib.php:41 -#, fuzzy #| msgid "Table must have at least one field." msgid "Table must have at least one column." -msgstr "Table must have at least one field." +msgstr "Table must have at least one column."
#: libraries/display_create_table.lib.php:48 #, php-format @@ -1988,20 +1982,19 @@ msgid "Create table on database %s" msgstr "Create table on database %s"
#: libraries/display_create_table.lib.php:57 -#, fuzzy #| msgid "Number of fields" msgid "Number of columns" -msgstr "Number of fields" +msgstr "Number of columns"
#: libraries/display_export.lib.php:42 msgid "Could not load export plugins, please check your installation!" msgstr "Could not load export plug-ins, please check your installation!"
#: libraries/display_export.lib.php:107 -#, fuzzy, php-format +#, php-format #| msgid "Dump %s row(s) starting at record # %s" msgid "Dump %s row(s) starting at row # %s" -msgstr "Dump %s row(s) starting at record # %s" +msgstr "Dump %s row(s) starting at row # %s"
#: libraries/display_export.lib.php:115 msgid "Dump all rows" @@ -2155,10 +2148,9 @@ msgstr "" "however it can break transactions."
#: libraries/display_import.lib.php:239 setup/lib/messages.inc.php:161 -#, fuzzy #| msgid "Number of records (queries) to skip from start" msgid "Number of queries to skip from start" -msgstr "Number of records (queries) to skip from start" +msgstr "Number of queries to skip from start"
#: libraries/display_import.lib.php:255 setup/lib/messages.inc.php:160 msgid "Format of imported file" @@ -2215,10 +2207,9 @@ msgid "%d is not valid row number." msgstr "%d is not valid row number."
#: libraries/display_tbl.lib.php:310 -#, fuzzy #| msgid "row(s) starting from record #" msgid "row(s) starting from row #" -msgstr "row(s) starting from record #" +msgstr "row(s) starting from row #"
#: libraries/display_tbl.lib.php:316 msgid "horizontal" @@ -2275,10 +2266,9 @@ msgid "Relational key" msgstr "Relational key"
#: libraries/display_tbl.lib.php:588 -#, fuzzy #| msgid "Relational display field" msgid "Relational display column" -msgstr "Relational display field" +msgstr "Relational display column"
#: libraries/display_tbl.lib.php:595 msgid "Show binary contents" @@ -2700,24 +2690,21 @@ msgstr "CSV"
#: libraries/export/csv.php:21 libraries/import/csv.php:27 #: libraries/import/csv.php:59 libraries/import/ldi.php:40 -#, fuzzy #| msgid "Lines terminated by" msgid "Columns terminated by" -msgstr "Lines terminated by" +msgstr "Columns terminated by"
#: libraries/export/csv.php:22 libraries/import/csv.php:28 #: libraries/import/csv.php:71 libraries/import/ldi.php:41 -#, fuzzy #| msgid "Fields enclosed by" msgid "Columns enclosed by" -msgstr "Fields enclosed by" +msgstr "Columns enclosed by"
#: libraries/export/csv.php:23 libraries/import/csv.php:29 #: libraries/import/csv.php:75 libraries/import/ldi.php:42 -#, fuzzy #| msgid "Fields escaped by" msgid "Columns escaped by" -msgstr "Fields escaped by" +msgstr "Columns escaped by"
#: libraries/export/csv.php:24 libraries/import/csv.php:30 #: libraries/import/csv.php:79 libraries/import/ldi.php:43 @@ -2733,20 +2720,18 @@ msgid "Replace NULL by" msgstr "Replace NULL by"
#: libraries/export/csv.php:26 libraries/export/excel.php:23 -#, fuzzy #| msgid "Remove CRLF characters within fields" msgid "Remove CRLF characters within columns" -msgstr "Remove CRLF characters within fields" +msgstr "Remove CRLF characters within columns"
#: libraries/export/csv.php:27 libraries/export/excel.php:24 #: libraries/export/htmlword.php:26 libraries/export/latex.php:57 #: libraries/export/ods.php:24 libraries/export/odt.php:50 #: libraries/export/texytext.php:34 libraries/export/xls.php:24 #: libraries/export/xlsx.php:24 -#, fuzzy #| msgid "Put fields names in the first row" msgid "Put columns names in the first row" -msgstr "Put fields names in the first row" +msgstr "Put columns names in the first row"
#: libraries/export/excel.php:18 msgid "CSV for MS Excel" @@ -2881,10 +2866,9 @@ msgid "Database export options" msgstr "Database export options"
#: libraries/export/sql.php:80 -#, fuzzy #| msgid "Enclose table and field names with backquotes" msgid "Enclose table and column names with backquotes" -msgstr "Enclose table and field names with backquotes" +msgstr "Enclose table and column names with backquotes"
#: libraries/export/sql.php:86 msgid "Add into comments" @@ -3103,10 +3087,10 @@ msgid "Invalid format of CSV input on line %d." msgstr "Invalid format of CSV input on line %d."
#: libraries/import/csv.php:312 -#, fuzzy, php-format +#, php-format #| msgid "Invalid field count in CSV input on line %d." msgid "Invalid column count in CSV input on line %d." -msgstr "Invalid field count in CSV input on line %d." +msgstr "Invalid column count in CSV input on line %d."
#: libraries/import/docsql.php:29 msgid "DocSQL" @@ -4481,10 +4465,9 @@ msgid "Run SQL query/queries on database %s" msgstr "Run SQL query/queries on database %s"
#: libraries/sql_query_form.lib.php:317 -#, fuzzy #| msgid "Column names" msgid "Columns" -msgstr "Column names" +msgstr "Columns"
#: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" @@ -4600,7 +4583,6 @@ msgid "Length/Values" msgstr "Length/Values"
#: libraries/tbl_properties.inc.php:105 -#, fuzzy #| msgid "" #| "If field type is "enum" or "set", please enter the values using this " #| "format: 'a','b','c'...<br />If you ever need to put a backslash ("\") " @@ -4612,10 +4594,10 @@ msgid "" "a single quote ("'") amongst those values, precede it with a backslash " "(for example '\\xyz' or 'a\'b')." msgstr "" -"If field type is "enum" or "set", please enter the values using this " -"format: 'a','b','c'...<br />If you ever need to put a backslash ("\") or " -"a single quote ("'") amongst those values, precede it with a backslash " -"(for example '\\xyz' or 'a\'b')." +"If column type is "enum" or "set", please enter the values using this " +"format: 'a','b','c'...<br />If you ever need to put a backslash ("\") or a " +"single quote ("'") amongst those values, precede it with a backslash (for " +"example '\\xyz' or 'a\'b')."
#: libraries/tbl_properties.inc.php:106 msgid "" @@ -4690,23 +4672,21 @@ msgid "Save" msgstr "Save"
#: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 -#, fuzzy, php-format +#, php-format #| msgid "Add column(s)" msgid "Add %s column(s)" -msgstr "Add column(s)" +msgstr "Add %s column(s)"
#: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 -#, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." -msgstr "You have to add at least one field." +msgstr "You have to add at least one column."
#: libraries/tbl_triggers.lib.php:29 msgid "Event" msgstr "Event"
#: libraries/transformations/application_octetstream__download.inc.php:10 -#, fuzzy #| msgid "" #| "Displays a link to download the binary data of the field. You can use the " #| "first option to specify the filename, or use the second option as the " @@ -4718,9 +4698,9 @@ msgid "" "of a column which contains the filename. If you use the second option, you " "need to set the first option to the empty string." msgstr "" -"Displays a link to download the binary data of the field. You can use the " +"Displays a link to download the binary data of the column. You can use the " "first option to specify the filename, or use the second option as the name " -"of a field which contains the filename. If you use the second option, you " +"of a column which contains the filename. If you use the second option, you " "need to set the first option to the empty string."
#: libraries/transformations/application_octetstream__hex.inc.php:10 @@ -4745,7 +4725,6 @@ msgid "Displays a link to download this image." msgstr "Displays a link to download this image."
#: libraries/transformations/text_plain__dateformat.inc.php:10 -#, fuzzy #| msgid "" #| "Displays a TIME, TIMESTAMP, DATETIME or numeric unix timestamp field as " #| "formatted date. The first option is the offset (in hours) which will be " @@ -4765,7 +4744,7 @@ msgid "" "documentation for PHP's strftime() function and for "utc" it is done using " "gmdate() function." msgstr "" -"Displays a TIME, TIMESTAMP, DATETIME or numeric unix timestamp field as " +"Displays a TIME, TIMESTAMP, DATETIME or numeric unix timestamp column as " "formatted date. The first option is the offset (in hours) which will be " "added to the timestamp (Default: 0). Use second option to specify a " "different date/time format string. Third option determines whether you want " @@ -4775,7 +4754,6 @@ msgstr "" "gmdate() function."
#: libraries/transformations/text_plain__external.inc.php:10 -#, fuzzy #| msgid "" #| "LINUX ONLY: Launches an external application and feeds it the field data " #| "via standard input. Returns the standard output of the application. The " @@ -4799,19 +4777,18 @@ msgid "" "will prevent wrapping and ensure that the output appears all on one line " "(Default 1)." msgstr "" -"LINUX ONLY: Launches an external application and feeds it the field data via " -"standard input. Returns the standard output of the application. The default " -"is Tidy, to pretty-print HTML code. For security reasons, you have to " -"manually edit the file libraries/transformations/text_plain__external.inc." -"php and list the tools you want to make available. The first option is then " -"the number of the program you want to use and the second option is the " -"parameters for the program. The third option, if set to 1, will convert the " -"output using htmlspecialchars() (Default 1). The fourth option, if set to 1, " -"will prevent wrapping and ensure that the output appears all on one line " -"(Default 1)." +"LINUX ONLY: Launches an external application and feeds it the column data " +"via standard input. Returns the standard output of the application. The " +"default is Tidy, to pretty-print HTML code. For security reasons, you have " +"to manually edit the file " +"libraries/transformations/text_plain__external.inc.php and list the tools " +"you want to make available. The first option is then the number of the " +"program you want to use and the second option is the parameters for the " +"program. The third option, if set to 1, will convert the output using " +"htmlspecialchars() (Default 1). The fourth option, if set to 1, will prevent " +"wrapping and ensure that the output appears all on one line (Default 1)."
#: libraries/transformations/text_plain__formatted.inc.php:10 -#, fuzzy #| msgid "" #| "Displays the contents of the field as-is, without running it through " #| "htmlspecialchars(). That is, the field is assumed to contain valid HTML." @@ -4819,11 +4796,10 @@ msgid "" "Displays the contents of the column as-is, without running it through " "htmlspecialchars(). That is, the column is assumed to contain valid HTML." msgstr "" -"Displays the contents of the field as-is, without running it through " -"htmlspecialchars(). That is, the field is assumed to contain valid HTML." +"Displays the contents of the column as-is, without running it through " +"htmlspecialchars(). That is, the column is assumed to contain valid HTML."
#: libraries/transformations/text_plain__imagelink.inc.php:10 -#, fuzzy #| msgid "" #| "Displays an image and a link; the field contains the filename. The first " #| "option is a URL prefix like "http://www.example.com/%5C". The second and " @@ -4833,12 +4809,11 @@ msgid "" "option is a URL prefix like "http://www.example.com/%5C". The second and " "third options are the width and the height in pixels." msgstr "" -"Displays an image and a link; the field contains the filename. The first " -"option is a URL prefix like "http://www.example.com/%5C". The second and " -"third options are the width and the height in pixels." +"Displays an image and a link; the column contains the filename. The first " +"option is a URL prefix like "http://www.example.com/%5C". The second and third " +"options are the width and the height in pixels."
#: libraries/transformations/text_plain__link.inc.php:10 -#, fuzzy #| msgid "" #| "Displays a link; the field contains the filename. The first option is a " #| "URL prefix like "http://www.example.com/%5C". The second option is a title " @@ -4848,9 +4823,9 @@ msgid "" "prefix like "http://www.example.com/%5C". The second option is a title for " "the link." msgstr "" -"Displays a link; the field contains the filename. The first option is a URL " -"prefix like "http://www.example.com/%5C". The second option is a title for " -"the link." +"Displays a link; the column contains the filename. The first option is a URL " +"prefix like "http://www.example.com/%5C". The second option is a title for the " +"link."
#: libraries/transformations/text_plain__longToIpv4.inc.php:10 msgid "" @@ -5073,16 +5048,14 @@ msgid "Create a page" msgstr "Create a page"
#: pdf_pages.php:310 -#, fuzzy #| msgid "Page number:" msgid "Page name" -msgstr "Page number:" +msgstr "Page name"
#: pdf_pages.php:314 -#, fuzzy #| msgid "Automatic layout" msgid "Automatic layout based on" -msgstr "Automatic layout" +msgstr "Automatic layout based on"
#: pdf_pages.php:316 msgid "Internal relations" @@ -5209,7 +5182,6 @@ msgid "To select relation, click :" msgstr "To select relation, click :"
#: pmd_help.php:29 -#, fuzzy #| msgid "" #| "The display field is shown in pink. To set/unset a field as the display " #| "field, click the "Choose field to display" icon, then click on the " @@ -5219,9 +5191,9 @@ msgid "" "column, click the "Choose column to display" icon, then click on the " "appropriate column name." msgstr "" -"The display field is shown in pink. To set/unset a field as the display " -"field, click the "Choose field to display" icon, then click on the " -"appropriate field name." +"The display column is shown in pink. To set/unset a column as the display " +"column, click the "Choose column to display" icon, then click on the " +"appropriate column name."
#: pmd_pdf.php:63 msgid "Page has been created" @@ -6311,7 +6283,6 @@ msgstr "" "documentation[/a]. Otherwise you will be only able to download or display it."
#: setup/lib/messages.inc.php:35 -#, fuzzy #| msgid "" #| "Defines which type of editing controls should be used for CHAR and " #| "VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]" @@ -6322,14 +6293,13 @@ msgid "" "kbd] - allows newlines in columns" msgstr "" "Defines which type of editing controls should be used for CHAR and VARCHAR " -"fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" -"kbd] - allows newlines in fields" +"columns; [kbd]input[/kbd] - allows limiting of input length, " +"[kbd]textarea[/kbd] - allows newlines in columns"
#: setup/lib/messages.inc.php:36 -#, fuzzy #| msgid "CHAR fields editing" msgid "CHAR columns editing" -msgstr "CHAR fields editing" +msgstr "CHAR columns editing"
#: setup/lib/messages.inc.php:37 msgid "Number of columns for CHAR/VARCHAR textareas" @@ -7053,7 +7023,6 @@ msgid "GZip output buffering" msgstr "GZip output buffering"
#: setup/lib/messages.inc.php:217 -#, fuzzy #| msgid "" #| "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, " #| "DATETIME and TIMESTAMP, ascending order otherwise" @@ -7061,7 +7030,7 @@ msgid "" "[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, " "DATETIME and TIMESTAMP, ascending order otherwise" msgstr "" -"[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, " +"[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, " "DATETIME and TIMESTAMP, ascending order otherwise"
#: setup/lib/messages.inc.php:218 @@ -7081,16 +7050,14 @@ msgid "Iconic table operations" msgstr "Iconic table operations"
#: setup/lib/messages.inc.php:224 -#, fuzzy #| msgid "Disallow BLOB and BINARY fields from editing" msgid "Disallow BLOB and BINARY columns from editing" -msgstr "Disallow BLOB and BINARY fields from editing" +msgstr "Disallow BLOB and BINARY columns from editing"
#: setup/lib/messages.inc.php:225 -#, fuzzy #| msgid "Protect binary fields" msgid "Protect binary columns" -msgstr "Protect binary fields" +msgstr "Protect binary columns"
#: setup/lib/messages.inc.php:226 msgid "" @@ -7554,7 +7521,6 @@ msgid "PDF schema: table coordinates" msgstr "PDF schema: table coordinates"
#: setup/lib/messages.inc.php:320 -#, fuzzy #| msgid "" #| "Table to describe the display fields, leave blank for no support; " #| "suggested: [kbd]pma_table_info[/kbd]" @@ -7562,14 +7528,13 @@ msgid "" "Table to describe the display columns, leave blank for no support; " "suggested: [kbd]pma_table_info[/kbd]" msgstr "" -"Table to describe the display fields, leave blank for no support; suggested: " -"[kbd]pma_table_info[/kbd]" +"Table to describe the display columns, leave blank for no support; " +"suggested: [kbd]pma_table_info[/kbd]"
#: setup/lib/messages.inc.php:321 -#, fuzzy #| msgid "Display fields table" msgid "Display columns table" -msgstr "Display fields table" +msgstr "Display columns table"
#: setup/lib/messages.inc.php:323 msgid "User for config auth" @@ -7600,12 +7565,10 @@ msgid "Verbose name of this server" msgstr "Verbose name of this server"
#: setup/lib/messages.inc.php:329 -#, fuzzy #| msgid "" #| "Whether a user should be displayed a "show all (records)" button" msgid "Whether a user should be displayed a "show all (rows)" button" -msgstr "" -"Whether a user should be displayed a "show all (records)" button" +msgstr "Whether a user should be displayed a "show all (rows)" button"
#: setup/lib/messages.inc.php:330 msgid "Allow to display all the rows" @@ -7897,10 +7860,9 @@ msgid "Ignore" msgstr "Ignore"
#: tbl_change.php:728 -#, fuzzy #| msgid " Because of its length,<br /> this field might not be editable " msgid " Because of its length,<br /> this column might not be editable " -msgstr " Because of its length,<br /> this field might not be editable " +msgstr " Because of its length,<br /> this column might not be editable "
#: tbl_change.php:888 msgid "Remove BLOB Repository Reference" @@ -8188,10 +8150,9 @@ msgid "Operator" msgstr "Operator"
#: tbl_select.php:270 -#, fuzzy #| msgid "Select fields (at least one):" msgid "Select columns (at least one):" -msgstr "Select fields (at least one):" +msgstr "Select columns (at least one):"
#: tbl_select.php:288 msgid "Add search conditions (body of the "where" clause):" @@ -8215,10 +8176,10 @@ msgid "None" msgstr "None"
#: tbl_structure.php:374 -#, fuzzy, php-format +#, php-format #| msgid "Table %s has been dropped" msgid "Column %s has been dropped" -msgstr "Table %s has been dropped" +msgstr "Column %s has been dropped"
#: tbl_structure.php:385 #, php-format @@ -8239,10 +8200,8 @@ msgid "Propose table structure" msgstr "Propose table structure"
#: tbl_structure.php:540 -#, fuzzy -#| msgid "Add column(s)" msgid "Add column" -msgstr "Add column(s)" +msgstr "Add column"
#: tbl_structure.php:554 msgid "At End of Table" diff --git a/po/sl.po b/po/sl.po index 8f8aa84..97b26cc 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-04 16:07-0400\n" -"PO-Revision-Date: 2010-06-03 20:07+0200\n" +"PO-Revision-Date: 2010-06-04 23:39+0200\n" "Last-Translator: Domen dbc334@gmail.com\n" "Language-Team: slovenian sl@li.org\n" "MIME-Version: 1.0\n" @@ -3369,6 +3369,9 @@ msgid "" "exceeded the value of binlog_cache_size and used a temporary file to store " "statements from the transaction." msgstr "" +"Število transakcij, ki so uporabile začasni predpomnilnik dvojiškega " +"dnevnika, vendar je ta presegel vrednost binlog_cache_size, zato so bile za " +"shranitev izjav iz transakcije uporabljene začasne datoteke."
#: libraries/messages.inc.php:63 msgid "The number of transactions that used the temporary binary log cache." @@ -3383,6 +3386,10 @@ msgid "" "to increase the tmp_table_size value to cause temporary tables to be memory-" "based instead of disk-based." msgstr "" +"Število začasnih tabel na disku, ki jih je strežnik samodejno ustvaril med " +"izvajanjem izjav. Če je Created_tmp_disk_tables velika, boste morda želeli " +"povečati vrednost tmp_table_size, zaradi česar bodo začasne tabele temeljile " +"na pomnilniku namesto na disku."
#: libraries/messages.inc.php:65 msgid "How many temporary files mysqld has created." @@ -3393,18 +3400,24 @@ msgid "" "The number of in-memory temporary tables created automatically by the server " "while executing statements." msgstr "" +"Število začasnih tabel v-pomnilniku, ki jih je strežnik samodejno ustvaril " +"med izvajanjem stavkov."
#: libraries/messages.inc.php:67 msgid "" "The number of rows written with INSERT DELAYED for which some error occurred " "(probably duplicate key)." msgstr "" +"Število vrstic zapisanih z INSERT DELAYED, pri katerih je prišlo do neke " +"napake (najverjetneje podvojen ključ)."
#: libraries/messages.inc.php:68 msgid "" "The number of INSERT DELAYED handler threads in use. Every different table " "on which one uses INSERT DELAYED gets its own thread." msgstr "" +"Število upravljalnih niti INSERT DELAYED v uporabi. Vsaka različna tabela, " +"na kateri se uporabi INSERT DELAYED, dobi svojo lastno nit."
#: libraries/messages.inc.php:69 msgid "The number of INSERT DELAYED rows written." @@ -3428,6 +3441,9 @@ msgid "" "table with a given name. This is called discovery. Handler_discover " "indicates the number of time tables have been discovered." msgstr "" +"Strežnik MySQL lahko vpraša skladiščni pogon NDB Cluster, če ve za tabelo z " +"navedenim imenom. Temu se reče odkritje. Handler_discover kaže koliko krat " +"so bile tabele odkrite."
#: libraries/messages.inc.php:74 msgid "" @@ -3435,12 +3451,18 @@ msgid "" "it suggests that the server is doing a lot of full index scans; for example, " "SELECT col1 FROM foo, assuming that col1 is indexed." msgstr "" +"Koliko krat je bil prvi vnos prebran iz indeksa. Če je vrednost visoka, " +"kaže, da strežnik izvaja mnogo pregledov indeksa; na primer: SELECT col1 " +"FROM foo, pri čemer se predpostavlja, da je col1 indeksiran."
#: libraries/messages.inc.php:75 msgid "" "The number of requests to read a row based on a key. If this is high, it is " "a good indication that your queries and tables are properly indexed." msgstr "" +"Število zahtev za branje vrstice temelječih na ključu. Če je ta vrednost " +"visoka, je to dober znak, da so vaše poizvedbe in tabele primerno " +"indeksirane."
#: libraries/messages.inc.php:76 msgid "" @@ -3448,12 +3470,17 @@ msgid "" "incremented if you are querying an index column with a range constraint or " "if you are doing an index scan." msgstr "" +"Število zahtev za branje naslednje vrstice v zaporedju ključa. To je " +"povečano, če poizvedujete po indeksnem stolpcu z omejitvijo obsega ali če " +"pregledujete indeks."
#: libraries/messages.inc.php:77 msgid "" "The number of requests to read the previous row in key order. This read " "method is mainly used to optimize ORDER BY ... DESC." msgstr "" +"Število poizvedb za branje prejšnje vrstice v zaporedju ključa. Ta postopek " +"branja se uporablja predvsem za optimizacijo ORDER BY ... DESC."
#: libraries/messages.inc.php:78 msgid "" @@ -3462,6 +3489,10 @@ msgid "" "probably have a lot of queries that require MySQL to scan whole tables or " "you have joins that don't use keys properly." msgstr "" +"Število zahtev za branje vrstice temelječih na ustaljenem položaju. To je " +"visoko, če izvajate veliko poizvedb, ki potrebujejo razvrščanje rezultata. " +"Najverjetneje imate veliko poizvedb, ki od MySQL zahtevajo pregled celotnih " +"tabel, ali stike, ki ne uporabljajo ključev pravilno."
#: libraries/messages.inc.php:79 msgid "" @@ -3470,6 +3501,10 @@ msgid "" "tables are not properly indexed or that your queries are not written to take " "advantage of the indexes you have." msgstr "" +"Število zahtev za branje naslednje vrstice v podatkovni datoteki. To je " +"visoko, če izvajate veliko pregledov tabel. Na splošno to kaže, da vaše " +"tabele niso primerno indeksirane ali da vaše poizvedbe ne izkoristijo " +"prednosti indeksov, ki jih imate."
#: libraries/messages.inc.php:80 msgid "The number of internal ROLLBACK statements."
hooks/post-receive
-
Michal Čihař