[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10081-g69e1c08
Michal Čihař
nijel at users.sourceforge.net
Thu Sep 9 14:27:11 CEST 2010
The branch, master has been updated
via 69e1c084b57e37de1edef98d3cfc238a63d4fc05 (commit)
via e40381eb14176c76349fab9fdbe295d6ca8c21ce (commit)
via 2645ac6d68fdb849a6273d07e719ac9567b46a13 (commit)
via 66b2eeae4392f3e5f89ed933c1c9fc7d0af8261f (commit)
via 23dc1ea5090ae7fef4b4becd574c3cb76028c99d (commit)
via e8ba6ae45583f1a6f76f17440c383792834b3a58 (commit)
via ee4e8a96310617bec890a45c366e50e824565905 (commit)
via 806778ea1fe19d8fbd3e4cb8b448e2f62fe788e9 (commit)
via 410b31383c2db923c9256b22a5c892864141e49b (commit)
via 257c5dbe0c20b9a9ffdc996481b433d1f767141e (commit)
via cd51ae964f92d69c44fc10356500b7347fdecaac (commit)
via c62fdbc1d02a3747ff7d96aa418d34509d375cdc (commit)
via 9d5b831a6145ffee9fb0b4483ba3fbef13d7925c (commit)
via e70a110b80f81e0932dc3f1240dfac15226bb25e (commit)
via ab107b50360a004e1840517634b5b9d21a684831 (commit)
via c3c870e7f2abb002e7ddad2f0955be37f511d9d7 (commit)
via e6f3067cde55e99ba17e2d220d778728b80158a1 (commit)
via a381176a4ea906b95e963990ede9f0f7657c1b04 (commit)
via eb87797a5f60e970d136ba142dfa0b63682cfdb4 (commit)
via 80cf7dec9cd2a05901981bdb551edf4b8ece0936 (commit)
via 9cdc14380daaddfc4ba970f95de2277e5ed7601f (commit)
via f86cf60b83d5aaaf4627b2242a005b9f9c08510d (commit)
from 11192e847c68dab55e4924412e03d5004b9ef75b (commit)
- Log -----------------------------------------------------------------
commit 69e1c084b57e37de1edef98d3cfc238a63d4fc05
Author: shanyan baishui <Siramizu at gmail.com>
Date: Thu Sep 9 14:26:40 2010 +0200
Translation update done using Pootle.
commit e40381eb14176c76349fab9fdbe295d6ca8c21ce
Author: shanyan baishui <Siramizu at gmail.com>
Date: Thu Sep 9 14:10:13 2010 +0200
Translation update done using Pootle.
commit 2645ac6d68fdb849a6273d07e719ac9567b46a13
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Thu Sep 9 10:40:04 2010 +0200
Translation update done using Pootle.
commit 66b2eeae4392f3e5f89ed933c1c9fc7d0af8261f
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Thu Sep 9 10:39:48 2010 +0200
Translation update done using Pootle.
commit 23dc1ea5090ae7fef4b4becd574c3cb76028c99d
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Thu Sep 9 10:39:18 2010 +0200
Translation update done using Pootle.
commit e8ba6ae45583f1a6f76f17440c383792834b3a58
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Thu Sep 9 10:38:56 2010 +0200
Translation update done using Pootle.
commit ee4e8a96310617bec890a45c366e50e824565905
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Thu Sep 9 10:38:40 2010 +0200
Translation update done using Pootle.
commit 806778ea1fe19d8fbd3e4cb8b448e2f62fe788e9
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Thu Sep 9 10:38:16 2010 +0200
Translation update done using Pootle.
commit 410b31383c2db923c9256b22a5c892864141e49b
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Thu Sep 9 10:37:56 2010 +0200
Translation update done using Pootle.
commit 257c5dbe0c20b9a9ffdc996481b433d1f767141e
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Wed Sep 8 22:43:24 2010 +0200
Translation update done using Pootle.
commit cd51ae964f92d69c44fc10356500b7347fdecaac
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Wed Sep 8 22:41:41 2010 +0200
Translation update done using Pootle.
commit c62fdbc1d02a3747ff7d96aa418d34509d375cdc
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Wed Sep 8 22:38:23 2010 +0200
Translation update done using Pootle.
commit 9d5b831a6145ffee9fb0b4483ba3fbef13d7925c
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Wed Sep 8 22:37:54 2010 +0200
Translation update done using Pootle.
commit e70a110b80f81e0932dc3f1240dfac15226bb25e
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Wed Sep 8 22:37:15 2010 +0200
Translation update done using Pootle.
commit ab107b50360a004e1840517634b5b9d21a684831
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Wed Sep 8 22:36:18 2010 +0200
Translation update done using Pootle.
commit c3c870e7f2abb002e7ddad2f0955be37f511d9d7
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Wed Sep 8 22:35:05 2010 +0200
Translation update done using Pootle.
commit e6f3067cde55e99ba17e2d220d778728b80158a1
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Wed Sep 8 22:34:51 2010 +0200
Translation update done using Pootle.
commit a381176a4ea906b95e963990ede9f0f7657c1b04
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Wed Sep 8 22:33:38 2010 +0200
Translation update done using Pootle.
commit eb87797a5f60e970d136ba142dfa0b63682cfdb4
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Wed Sep 8 22:33:21 2010 +0200
Translation update done using Pootle.
commit 80cf7dec9cd2a05901981bdb551edf4b8ece0936
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Wed Sep 8 22:08:29 2010 +0200
Translation update done using Pootle.
commit 9cdc14380daaddfc4ba970f95de2277e5ed7601f
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Wed Sep 8 22:05:28 2010 +0200
Translation update done using Pootle.
commit f86cf60b83d5aaaf4627b2242a005b9f9c08510d
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Wed Sep 8 22:01:15 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/nb.po | 15 +++++------
po/tr.po | 34 ++++++++++++------------
po/zh_CN.po | 79 +++--------------------------------------------------------
3 files changed, 28 insertions(+), 100 deletions(-)
diff --git a/po/nb.po b/po/nb.po
index 1395649..8b56563 100644
--- a/po/nb.po
+++ b/po/nb.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-09-07 15:21+0200\n"
-"PO-Revision-Date: 2010-09-08 13:12+0200\n"
+"PO-Revision-Date: 2010-09-09 10:40+0200\n"
"Last-Translator: <sven.erik.andersen at gmail.com>\n"
"Language-Team: norwegian <no at li.org>\n"
"Language: nb\n"
@@ -2067,7 +2067,6 @@ msgid "complete inserts"
msgstr "Komplette innlegg"
#: libraries/config.values.php:120
-#, fuzzy
#| msgid "Extended inserts"
msgid "extended inserts"
msgstr "Utvidete innlegg"
@@ -2122,27 +2121,26 @@ msgstr "ikke tilgjengelig"
#: libraries/config/FormDisplay.class.php:732
#, php-format
msgid "\"%s\" requires %s extension"
-msgstr ""
+msgstr "\"%s\" trenger %s tillegget"
#: libraries/config/FormDisplay.class.php:746
#, php-format
msgid "import will not work, missing function (%s)"
-msgstr ""
+msgstr "import vil ikke fungere, mangler funksjon (%s)"
#: libraries/config/FormDisplay.class.php:750
#, php-format
msgid "export will not work, missing function (%s)"
-msgstr ""
+msgstr "Eksport vil ikke fungere, mangler funksjon (%s)"
#: libraries/config/FormDisplay.class.php:757
msgid "SQL Validator is disabled"
msgstr "SQL Validator er avslått"
#: libraries/config/FormDisplay.class.php:764
-#, fuzzy
#| msgid "PHP extension to use"
msgid "SOAP extension not found"
-msgstr "Bruk PHP modul"
+msgstr "SOAP tillegg ble ikke funnet"
#: libraries/config/FormDisplay.class.php:772
#, php-format
@@ -2153,6 +2151,7 @@ msgstr "maksimum %s"
#: libraries/config/FormDisplay.tpl.php:173
msgid "This setting is disabled, it will not be applied to your configuration"
msgstr ""
+"Denne innstillingen er avslått, den vil ikke bli lagt til din konfigurasjon"
#: libraries/config/FormDisplay.tpl.php:248
#, php-format
@@ -2317,7 +2316,7 @@ msgstr ""
#: libraries/config/messages.inc.php:43
msgid "Debug SQL"
-msgstr ""
+msgstr "Debug SQL"
#: libraries/config/messages.inc.php:44
#, fuzzy
diff --git a/po/tr.po b/po/tr.po
index 48603c3..04c2b3b 100644
--- a/po/tr.po
+++ b/po/tr.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-09-07 15:21+0200\n"
-"PO-Revision-Date: 2010-09-08 05:30+0200\n"
+"PO-Revision-Date: 2010-09-08 22:43+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit at hotmail.com>\n"
"Language-Team: turkish <tr at li.org>\n"
"Language: tr\n"
@@ -651,7 +651,7 @@ msgstr "Görünüm"
#: libraries/server_links.inc.php:90 server_replication.php:31
#: server_replication.php:162 server_status.php:375
msgid "Replication"
-msgstr "Kopya etme"
+msgstr "Kopya Etme"
#: db_structure.php:473
msgid "Sum"
@@ -1619,7 +1619,7 @@ msgstr "Bağlanamıyor: geçersiz ayarlar."
#: test/theme.php:151
#, php-format
msgid "Welcome to %s"
-msgstr "%s sürümüne Hoş Geldiniz"
+msgstr "%s'e Hoş Geldiniz"
#: libraries/auth/config.auth.lib.php:106
#, php-format
@@ -4279,7 +4279,7 @@ msgstr "Microsoft Word 2000"
#: libraries/config/setup.forms.php:358
#: libraries/config/user_preferences.forms.php:260 libraries/export/odt.php:21
msgid "Open Document Text"
-msgstr "Açık Belge Metini"
+msgstr "Açık Belge Metni"
#: libraries/config/validate.lib.php:198 libraries/config/validate.lib.php:205
msgid "Could not connect to MySQL server"
@@ -5991,7 +5991,7 @@ msgstr "Slave yapılandırması"
#: libraries/replication_gui.lib.php:53 server_replication.php:345
msgid "Change or reconfigure master server"
-msgstr "Asıl sunucuyu değiştir veya yeniden yapılandır"
+msgstr "Master sunucuyu değiştir veya yeniden yapılandır"
#: libraries/replication_gui.lib.php:54
msgid ""
@@ -7149,7 +7149,7 @@ msgstr "Veritabanı istatistikleri"
#: server_databases.php:206 server_replication.php:179
#: server_replication.php:207
msgid "Master replication"
-msgstr "Asılı kopya etme"
+msgstr "Master kopya etme"
#: server_databases.php:208 server_replication.php:246
msgid "Slave replication"
@@ -7660,12 +7660,12 @@ msgstr "Master değiştirilemiyor"
#: server_replication.php:72
#, php-format
msgid "Master server changed succesfully to %s"
-msgstr "Asıl sunucu %s 'na başarılı olarak değiştirildi"
+msgstr "Master sunucu %s'na başarılı olarak değiştirildi"
#: server_replication.php:180
msgid "This server is configured as master in a replication process."
msgstr ""
-"Bu sunucu kopya etme işlemi sırasında asıl sunucu olarak yapılandırıldı."
+"Bu sunucu kopya etme işlemi sırasında master sunucu olarak yapılandırıldı."
#: server_replication.php:182 server_status.php:398
msgid "Show master status"
@@ -7681,8 +7681,8 @@ msgid ""
"This server is not configured as master in a replication process. Would you "
"like to <a href=\"%s\">configure</a> it?"
msgstr ""
-"Bu sunucu kopya etme işlemi sırasında asıl sunucu olarak yapılandırılmadı. "
-"Bunu <a href=\"%s\">yapılandırmak</a> ister misiniz?"
+"Bu sunucu, kopya etme işlemi sırasında master sunucu olarak yapılandırılmaz. "
+"Bunu <a href=\"%s\">yapılandırmak</a> istiyor musunuz?"
#: server_replication.php:215
msgid "Master configuration"
@@ -7696,12 +7696,12 @@ msgid ""
"ignore all databases by default and allow only certain databases to be "
"replicated. Please select the mode:"
msgstr ""
-"Bu sunucu kopya etme işlemi sırasında asıl sunucu olarak yapılandırılmadı. "
+"Bu sunucu, kopya etme işlemi sırasında master sunucu olarak yapılandırılmaz. "
"Ya tüm veritabanlarının kopya etmeyi ve belirli olanı yok saymayı (eğer "
"veritabanlarının çoğunluğunu kopya etmek isterseniz kullanışlıdır) "
"seçebilirsiniz ya da varsayılan olarak tüm veritabanlarını yoksaymayı ve "
"kopya etmek için sadece belirli veritabanlarına izin verebilirsiniz. Lütfen "
-"modu seçin:"
+"kipi seçin:"
#: server_replication.php:219
msgid "Replicate all databases; Ignore:"
@@ -7730,7 +7730,7 @@ msgid ""
"master"
msgstr ""
"MySQL sunucusunu bir kez yeniden başlattığınızda, lütfen Git düğmesine "
-"tıklayın. Ondan sonra bu sunucunun asıl olarak <b>yapılandırıldığını</b> "
+"tıklayın. Ondan sonra bu sunucunun master olarak <b>yapılandırıldığını</b> "
"gösteren, sizi uyaran bir mesaj görmelisiniz"
#: server_replication.php:291
@@ -7745,7 +7745,7 @@ msgstr "Slave G/Ç işlemi çalışmıyor!"
msgid ""
"Server is configured as slave in a replication process. Would you like to:"
msgstr ""
-"Sunucu kopya etme işlemi sırasında slave sunucu olarak yapılandırıldı. Bunu "
+"Sunucu kopya etme işlemi sırasında slave sunucu olarak yapılandırılır. Bunu "
"istiyor musunuz:"
#: server_replication.php:306
@@ -7754,7 +7754,7 @@ msgstr "Slave durum tablosuna bak"
#: server_replication.php:309
msgid "Synchronize databases with master"
-msgstr "Asılı ile veritabanlarını eşitle"
+msgstr "Veritabanlarını master ile eşitle"
#: server_replication.php:320
msgid "Control slave:"
@@ -7816,8 +7816,8 @@ msgid ""
"This server is not configured as slave in a replication process. Would you "
"like to <a href=\"%s\">configure</a> it?"
msgstr ""
-"Bu sunucu kopya etme işlemi sırasında slave sunucu olarak yapılandırılmadı. "
-"Bunu <a href=\"%s\">yapılandırmak</a> ister misiniz?"
+"Bu sunucu, kopya etme işlemi sırasında slave sunucu olarak yapılandırılmaz. "
+"Bunu <a href=\"%s\">yapılandırmak</a> istiyor musunuz?"
#: server_status.php:46
msgid ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 71f56dd..41bbd50 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,8 +4,8 @@ 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-09-07 15:21+0200\n"
-"PO-Revision-Date: 2010-09-06 11:42+0200\n"
-"Last-Translator: Michal Čihař <michal at cihar.com>\n"
+"PO-Revision-Date: 2010-09-09 14:26+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"
"MIME-Version: 1.0\n"
@@ -809,7 +809,7 @@ msgstr "字段“%s”的值"
#: enum_editor.php:22 libraries/tbl_properties.inc.php:799
msgid "Enter each value in a separate field."
-msgstr ""
+msgstr "请将每个值分别输入在不同的输入框中。"
#: export.php:73
msgid "Selected export type has to be saved in file!"
@@ -3010,10 +3010,9 @@ msgid "Display servers selection"
msgstr "显示服务器选择"
#: libraries/config/messages.inc.php:268
-#, fuzzy
#| msgid "Display databases in a tree"
msgid "Display table filter"
-msgstr "以树形显示数据库"
+msgstr "显示数据表快速搜索框"
#: libraries/config/messages.inc.php:269
msgid "String that separates databases into different tree levels"
@@ -9372,73 +9371,3 @@ msgstr "视图名"
#: view_operations.php:91
msgid "Rename view to"
msgstr "将视图改名为"
-
-#~| msgid ""
-#~| "Please enter the values for transformation options using this format: "
-#~| "'a', 100, 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')."
-#~ msgid ""
-#~ "Enter each value in a separate field, enclosed in single quotes. 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')."
-#~ msgstr ""
-#~ "请在不同区域中分别输入每个值,并用单引号括起。如果需要在值中输入反斜杠 "
-#~ "(“\\”)或单引号(“'”),请在前面加上反斜杠 (如 '\\\\xyz' 或 'a\\'b')。"
-
-#~| msgid ""
-#~| "Please enter the values for transformation options using this format: "
-#~| "'a', 100, 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')."
-#~ msgid ""
-#~ "Enter each value in a separate field. 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')."
-#~ msgstr ""
-#~ "请将值分别输入。如果需要输入反斜杠 (“\\”) 或单引号 (“'”),请在前面加上反斜"
-#~ "杠 (如 '\\\\xyz' 或 'a\\'b')。"
-
-#~ msgid "New table"
-#~ msgstr "新数据表"
-
-#~ msgid "server name"
-#~ msgstr "服务器名"
-
-#~ msgid "database name"
-#~ msgstr "数据库名"
-
-#~ msgid "table name"
-#~ msgstr "数据表名"
-
-#~ msgid "Edit PDF Pages"
-#~ msgstr "编辑 PDF 页"
-
-#~ msgid "Data Dictionary Format"
-#~ msgstr "数据字典格式"
-
-#~ msgid "no"
-#~ msgstr "否"
-
-#~ msgid "Enter login options for signon authentication"
-#~ msgstr "设置 signon 认证方式选项"
-
-#~ msgid "Signon login options"
-#~ msgstr "Signon 登录参数"
-
-#~ msgid "PMA database"
-#~ msgstr "PMA 数据库"
-
-#~ msgid "Customization"
-#~ msgstr "自定义"
-
-#~ msgid ""
-#~ "SQL queries settings, for SQL Query box options see [a@?page=form&"
-#~ "formset=main_frame#tab_Sql_box]Navigation frame[/a] settings"
-#~ msgstr ""
-#~ "SQL 查询设置,要设置 SQL 查询框请到[a@?page=form&"
-#~ "formset=main_frame#tab_Sql_box]主框架[/a]设置中修改"
-
-#~ msgid "yes"
-#~ msgstr "是"
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list