[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4691-g74274b3

Michal Čihař nijel at users.sourceforge.net
Fri Jun 4 15:45:48 CEST 2010


The branch, master has been updated
       via  74274b369c5782901e9cde0d776f877a2bf02b72 (commit)
       via  8c38d02255deb5d52326d04b060609bf73f597e7 (commit)
       via  e98f01c2c60c743a0902d0f4ca66c38010341cf7 (commit)
       via  bd42e3ff45cecee31848b7aed083458f05e87d34 (commit)
       via  7c8c858d1b6c68a8b6107bf08ccc439ea5ab76c7 (commit)
       via  72e7267e7bcfead000f79dd6e948f405032910f3 (commit)
       via  e83a035df296351e8baf6e9dd44939dbdf9c6ef3 (commit)
       via  32efbe7d025f950b2e807c7b1e599fad8922135d (commit)
       via  113024e7bc053c8ef5b1bc32e2287485894f41cb (commit)
       via  3d722627143a2187465474a378342ce0d6a3996b (commit)
       via  52853220aa2dca6a957f058228f79e779e5e6c5f (commit)
       via  b753070c2cd07a9ce62025a7033954738a9c0130 (commit)
       via  e2bb2c4dcf1882fcdf644bb1a9fc8cf43d9412de (commit)
       via  cad2ca2ff5b0c673e2c4017953b3b1f87556ce67 (commit)
       via  1a7c4a8b93da360a9eeb0612a5d74cc420b38607 (commit)
       via  1c8bf043e00d639b560169efc167100f7ac1550c (commit)
       via  c9dc585e4a48f98e725d4946e4fdcdee1412d67d (commit)
       via  84d2e8308e67c84f2ea7ffb54aa2ee1ac270eba9 (commit)
       via  d98bf9ca91f9a4f4e20807f8b73748edf837048d (commit)
       via  6741900bccbe20940d9ee809fcc5d0631a467ce5 (commit)
       via  cbfcc0cc253baa74f37e2ec4d02dc9591cc31024 (commit)
      from  662f3d4da33363f77051a847488d41f40cf33655 (commit)


- Log -----------------------------------------------------------------
commit 74274b369c5782901e9cde0d776f877a2bf02b72
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Fri Jun 4 14:09:53 2010 +0200

    Translation update done using Pootle.

commit 8c38d02255deb5d52326d04b060609bf73f597e7
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Fri Jun 4 14:09:38 2010 +0200

    Translation update done using Pootle.

commit e98f01c2c60c743a0902d0f4ca66c38010341cf7
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Fri Jun 4 14:08:55 2010 +0200

    Translation update done using Pootle.

commit bd42e3ff45cecee31848b7aed083458f05e87d34
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Fri Jun 4 14:08:01 2010 +0200

    Translation update done using Pootle.

commit 7c8c858d1b6c68a8b6107bf08ccc439ea5ab76c7
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Fri Jun 4 14:06:43 2010 +0200

    Translation update done using Pootle.

commit 72e7267e7bcfead000f79dd6e948f405032910f3
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Fri Jun 4 14:05:52 2010 +0200

    Translation update done using Pootle.

commit e83a035df296351e8baf6e9dd44939dbdf9c6ef3
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Fri Jun 4 14:05:42 2010 +0200

    Translation update done using Pootle.

commit 32efbe7d025f950b2e807c7b1e599fad8922135d
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Fri Jun 4 14:02:22 2010 +0200

    Translation update done using Pootle.

commit 113024e7bc053c8ef5b1bc32e2287485894f41cb
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Fri Jun 4 14:01:50 2010 +0200

    Translation update done using Pootle.

commit 3d722627143a2187465474a378342ce0d6a3996b
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Fri Jun 4 14:00:20 2010 +0200

    Translation update done using Pootle.

commit 52853220aa2dca6a957f058228f79e779e5e6c5f
Merge: b753070c2cd07a9ce62025a7033954738a9c0130 662f3d4da33363f77051a847488d41f40cf33655
Author: Pootle server <pootle at cihar.com>
Date:   Thu Jun 3 22:40:42 2010 +0200

    Merge remote branch 'origin/master'

commit b753070c2cd07a9ce62025a7033954738a9c0130
Author: canin <canin at in.com>
Date:   Thu Jun 3 21:04:33 2010 +0200

    Translation update done using Pootle.

commit e2bb2c4dcf1882fcdf644bb1a9fc8cf43d9412de
Author: canin <canin at in.com>
Date:   Thu Jun 3 20:59:43 2010 +0200

    Translation update done using Pootle.

commit cad2ca2ff5b0c673e2c4017953b3b1f87556ce67
Author: canin <canin at in.com>
Date:   Thu Jun 3 20:50:36 2010 +0200

    Translation update done using Pootle.

commit 1a7c4a8b93da360a9eeb0612a5d74cc420b38607
Author: canin <canin at in.com>
Date:   Thu Jun 3 20:49:14 2010 +0200

    Translation update done using Pootle.

commit 1c8bf043e00d639b560169efc167100f7ac1550c
Author: Domen <dbc334 at gmail.com>
Date:   Thu Jun 3 20:07:29 2010 +0200

    Translation update done using Pootle.

commit c9dc585e4a48f98e725d4946e4fdcdee1412d67d
Author: Domen <dbc334 at gmail.com>
Date:   Thu Jun 3 20:06:49 2010 +0200

    Translation update done using Pootle.

commit 84d2e8308e67c84f2ea7ffb54aa2ee1ac270eba9
Author: Domen <dbc334 at gmail.com>
Date:   Thu Jun 3 20:06:43 2010 +0200

    Translation update done using Pootle.

commit d98bf9ca91f9a4f4e20807f8b73748edf837048d
Author: Domen <dbc334 at gmail.com>
Date:   Thu Jun 3 20:06:37 2010 +0200

    Translation update done using Pootle.

commit 6741900bccbe20940d9ee809fcc5d0631a467ce5
Author: Domen <dbc334 at gmail.com>
Date:   Thu Jun 3 20:06:14 2010 +0200

    Translation update done using Pootle.

commit cbfcc0cc253baa74f37e2ec4d02dc9591cc31024
Author: Domen <dbc334 at gmail.com>
Date:   Thu Jun 3 20:05:48 2010 +0200

    Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes:
 po/de.po    |   15 ++++++---------
 po/sl.po    |   10 +++++-----
 po/zh_CN.po |   33 ++++++++++++---------------------
 3 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/po/de.po b/po/de.po
index 7da0c75..adfc4dc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-05-31 14:33-0400\n"
-"PO-Revision-Date: 2010-05-28 14:10+0200\n"
-"Last-Translator:  <torsten.funck at googlemail.com>\n"
+"PO-Revision-Date: 2010-06-03 21:04+0200\n"
+"Last-Translator:  <canin at in.com>\n"
 "Language-Team: german <de at li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.1\n"
 
@@ -454,7 +454,6 @@ msgid "Add/Delete criteria rows"
 msgstr "Zeilen hinzufügen/entfernen"
 
 #: db_qbe.php:596
-#, fuzzy
 #| msgid "Add/Delete Field Columns"
 msgid "Add/Delete columns"
 msgstr "Spalten hinzufügen/entfernen"
@@ -1006,10 +1005,9 @@ msgid "Please select the primary key or a unique key"
 msgstr "Bitte den PRIMARY KEY oder einen UNIQUE KEY wählen"
 
 #: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548
-#, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display"
-msgstr "Anzuzeigende Spalte bestimmen"
+msgstr "Anzuzeigende Spalte auswählen"
 
 #. l10n: Display text for calendar close link
 #: js/messages.php:73
@@ -2759,7 +2757,6 @@ msgid "Replace NULL by"
 msgstr "Ersetze NULL durch"
 
 #: libraries/export/csv.php:26 libraries/export/excel.php:23
-#, fuzzy
 #| msgid "Remove CRLF characters within fields"
 msgid "Remove CRLF characters within columns"
 msgstr "CRLF-Zeichen aus den Feldern entfernen"
@@ -4769,10 +4766,10 @@ msgid "Save"
 msgstr "Speichern"
 
 #: 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 "Spalte(n) einfügen"
+msgstr "%s Spalte(n) einfügen"
 
 #: libraries/tbl_properties.inc.php:784 tbl_structure.php:536
 #, fuzzy
diff --git a/po/sl.po b/po/sl.po
index 5f2e589..271f0c2 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 at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-05-31 14:33-0400\n"
-"PO-Revision-Date: 2010-06-01 18:58+0200\n"
+"PO-Revision-Date: 2010-06-03 20:07+0200\n"
 "Last-Translator: Domen <dbc334 at gmail.com>\n"
 "Language-Team: slovenian <sl at li.org>\n"
 "Language: sl\n"
@@ -2666,19 +2666,19 @@ msgstr ""
 
 #: libraries/engines/pbxt.lib.php:68
 msgid "Data file grow size"
-msgstr ""
+msgstr "Velikost rasti podatkovnih datotek"
 
 #: libraries/engines/pbxt.lib.php:69
 msgid "The grow size of the handle data (.xtd) files."
-msgstr ""
+msgstr "Velikost rasti datotek za ravnanje s podatki (.xtd)."
 
 #: libraries/engines/pbxt.lib.php:73
 msgid "Row file grow size"
-msgstr ""
+msgstr "Velikost rasti datotek vrstic"
 
 #: libraries/engines/pbxt.lib.php:74
 msgid "The grow size of the row pointer (.xtr) files."
-msgstr ""
+msgstr "Velikost rasti datotek kazalca vrstic (.xtr)."
 
 #: libraries/engines/pbxt.lib.php:78
 msgid "Log file count"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 68ad257..e15ec5e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-05-31 14:33-0400\n"
-"PO-Revision-Date: 2010-06-03 03:49+0200\n"
+"PO-Revision-Date: 2010-06-04 14:09+0200\n"
 "Last-Translator: shanyan baishui <Siramizu at gmail.com>\n"
 "Language-Team: chinese_simplified <zh_CN at li.org>\n"
 "Language: zh_CN\n"
@@ -110,10 +110,9 @@ msgstr "表注释"
 #: 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 "字段名"
+msgstr "字段"
 
 #: 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
@@ -2173,10 +2172,9 @@ msgid "%d is not valid row number."
 msgstr "%d 不是有效行数。"
 
 #: libraries/display_tbl.lib.php:310
-#, fuzzy
 #| msgid "row(s) starting from record #"
 msgid "row(s) starting from row #"
-msgstr "行,开始行数:"
+msgstr "行,起始行 #"
 
 #: libraries/display_tbl.lib.php:316
 msgid "horizontal"
@@ -4539,10 +4537,10 @@ msgid "Save"
 msgstr "保存"
 
 #: 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 "增加字段"
+msgstr "添加 %s 个字段"
 
 #: libraries/tbl_properties.inc.php:784 tbl_structure.php:536
 #| msgid "You have to add at least one field."
@@ -7270,18 +7268,15 @@ msgid "PDF schema: table coordinates"
 msgstr "PDF 大纲: 数据表并发"
 
 #: 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]"
 msgid ""
 "Table to describe the display columns, leave blank for no support; "
 "suggested: [kbd]pma_table_info[/kbd]"
-msgstr ""
-"描述显示字段的表,留空为关闭此项功能。默认值:[kbd]pma_table_info[/kbd]"
+msgstr "描述显示字段的表,不使用请留空,默认:[kbd]pma_table_info[/kbd]"
 
 #: setup/lib/messages.inc.php:321
-#, fuzzy
 #| msgid "Display fields table"
 msgid "Display columns table"
 msgstr "显示字段表"
@@ -7311,11 +7306,10 @@ msgid "Verbose name of this server"
 msgstr "服务器名称"
 
 #: 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 "显示给用户一个 "显示所有 (记录)" 按钮"
+msgstr "设置是否给用户显示一个 "显示所有 (记录)" 的按钮"
 
 #: setup/lib/messages.inc.php:330
 msgid "Allow to display all the rows"
@@ -7593,10 +7587,9 @@ msgid "Ignore"
 msgstr "忽略"
 
 #: 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 " 由于长度限制<br />此字段可能无法编辑 "
+msgstr " 因长度问题,<br /> 该字段可能无法编辑 "
 
 #: tbl_change.php:888
 msgid "Remove BLOB Repository Reference"
@@ -7880,10 +7873,9 @@ msgid "Operator"
 msgstr "操作符"
 
 #: tbl_select.php:270
-#, fuzzy
 #| msgid "Select fields (at least one):"
 msgid "Select columns (at least one):"
-msgstr "至少选择一个字段:"
+msgstr "选择字段 (至少一个):"
 
 #: tbl_select.php:288
 msgid "Add search conditions (body of the \"where\" clause):"
@@ -7907,10 +7899,10 @@ msgid "None"
 msgstr "无"
 
 #: tbl_structure.php:374
-#, fuzzy, php-format
+#, php-format
 #| msgid "Table %s has been dropped"
 msgid "Column %s has been dropped"
-msgstr "已删除表 %s "
+msgstr "已删除字段 %s "
 
 #: tbl_structure.php:385
 #, php-format
@@ -7931,10 +7923,9 @@ msgid "Propose table structure"
 msgstr "规划表结构"
 
 #: tbl_structure.php:540
-#, fuzzy
 #| msgid "Add new field"
 msgid "Add field"
-msgstr "添加新字段"
+msgstr "添加字段"
 
 #: tbl_structure.php:554
 msgid "At End of Table"


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list