[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA1-419-gb32e5b8
Michal Čihař
nijel at users.sourceforge.net
Fri Nov 26 11:09:53 CET 2010
The branch, master has been updated
via b32e5b8235126dbee0c7eceb6c5be87f7cb011d1 (commit)
via d63d33792fe7d5d1074751410b4466b7bdf288a3 (commit)
via 37a9ad1d9e56e10c1a54f9ab00930b605ea2590a (commit)
via 00ec845626879be4b22a5723391492e96e92f7b4 (commit)
via 0104a5dc0ea712b9d44b1a173f019ad89ab9ff57 (commit)
via 3b6d41b97a0aa27f9cf1f85e932869fa418f3e95 (commit)
via 051905d5b4f153ce741b7f473df18d87655306fa (commit)
via 5030078c22a3b879f5621844aa914bfaf5f96ec8 (commit)
via d4d9571a9d0544cf361e9964f95bb4e934c3f169 (commit)
via 194c36bb5e399877d2841ea72ff5858ee7367995 (commit)
via e2580d7c60a466fb5060830fd261b756f7433078 (commit)
via 13c27e2fa70c0cdd2b2100bff85d784000f61a39 (commit)
via 40c27b1bbbe9741b3fc1e760dc9b8bdb8e3bb987 (commit)
via 998be4aea25a18918b34195cd7acf82c7ce42a97 (commit)
via 22cb119d1a7afe9a9d9d08574bfd479e9609da15 (commit)
via 9029c60e585de41f22275108bd8b38214af8c235 (commit)
via efd4f99f5fb71405696fb9ba45914b16f77148b2 (commit)
via 88123b25c54d6b635365322c62c775cd28876c71 (commit)
via e281b47d1a2b350e457dda1951def515cc57ee9e (commit)
via 7a6eef63418148d7698fe2ba9da5875e41fcab30 (commit)
via 200c0f29779552bed799dfcbdd6b4f6082e746f7 (commit)
via ad29c29313ec9e0cd8756bce4e348a3efedcfb5b (commit)
via 8709005b7abee4f7a351bce3838ffa65ab9ed6ea (commit)
via 4b681fbfd4fdefa2bee0a945f0e1858f29a754af (commit)
via 10ec3813c9dc22a63be616fa63edf03236ef5196 (commit)
from 3da51d8f09b0647ee153d78908f46704f4524c50 (commit)
- Log -----------------------------------------------------------------
commit b32e5b8235126dbee0c7eceb6c5be87f7cb011d1
Merge: d63d33792fe7d5d1074751410b4466b7bdf288a3 22cb119d1a7afe9a9d9d08574bfd479e9609da15
Author: Michal Čihař <michal at cihar.com>
Date: Fri Nov 26 11:08:22 2010 +0100
Merge remote branch 'pootle/master'
commit d63d33792fe7d5d1074751410b4466b7bdf288a3
Merge: 3da51d8f09b0647ee153d78908f46704f4524c50 37a9ad1d9e56e10c1a54f9ab00930b605ea2590a
Author: Michal Čihař <michal at cihar.com>
Date: Fri Nov 26 11:08:22 2010 +0100
Merge branch 'QA_3_4'
commit 22cb119d1a7afe9a9d9d08574bfd479e9609da15
Author: Michal Čihař <michal at cihar.com>
Date: Fri Nov 26 12:01:23 2010 +0200
Translation update done using Pootle.
commit 9029c60e585de41f22275108bd8b38214af8c235
Author: Michal Čihař <michal at cihar.com>
Date: Fri Nov 26 12:01:20 2010 +0200
Translation update done using Pootle.
commit efd4f99f5fb71405696fb9ba45914b16f77148b2
Author: Michal Čihař <michal at cihar.com>
Date: Fri Nov 26 12:01:17 2010 +0200
Translation update done using Pootle.
commit 88123b25c54d6b635365322c62c775cd28876c71
Author: Michal Čihař <michal at cihar.com>
Date: Fri Nov 26 12:01:14 2010 +0200
Translation update done using Pootle.
commit e281b47d1a2b350e457dda1951def515cc57ee9e
Author: Michal Čihař <michal at cihar.com>
Date: Fri Nov 26 12:01:11 2010 +0200
Translation update done using Pootle.
commit 7a6eef63418148d7698fe2ba9da5875e41fcab30
Author: Michal Čihař <michal at cihar.com>
Date: Fri Nov 26 12:01:07 2010 +0200
Translation update done using Pootle.
commit 200c0f29779552bed799dfcbdd6b4f6082e746f7
Author: Michal Čihař <michal at cihar.com>
Date: Fri Nov 26 12:01:04 2010 +0200
Translation update done using Pootle.
commit ad29c29313ec9e0cd8756bce4e348a3efedcfb5b
Author: Michal Čihař <michal at cihar.com>
Date: Fri Nov 26 12:00:57 2010 +0200
Translation update done using Pootle.
commit 8709005b7abee4f7a351bce3838ffa65ab9ed6ea
Author: Michal Čihař <michal at cihar.com>
Date: Fri Nov 26 12:00:52 2010 +0200
Translation update done using Pootle.
commit 4b681fbfd4fdefa2bee0a945f0e1858f29a754af
Author: Michal Čihař <michal at cihar.com>
Date: Fri Nov 26 12:00:47 2010 +0200
Translation update done using Pootle.
commit 10ec3813c9dc22a63be616fa63edf03236ef5196
Author: Michal Čihař <michal at cihar.com>
Date: Fri Nov 26 12:00:42 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/en_GB.po | 36 ++++++++++++++----------------------
1 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/po/en_GB.po b/po/en_GB.po
index 32ec713..910310b 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 at lists.sourceforge.net\n"
"POT-Creation-Date: 2010-11-20 07:34-0500\n"
-"PO-Revision-Date: 2010-11-19 13:06+0200\n"
-"Last-Translator: Marc Delisle <marc at infomarc.info>\n"
+"PO-Revision-Date: 2010-11-26 12:01+0200\n"
+"Last-Translator: Michal Čihař <michal at cihar.com>\n"
"Language-Team: english-gb <en_GB at 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.5\n"
@@ -410,11 +410,11 @@ msgstr "You have to choose at least one column to display"
#: db_qbe.php:182
msgid "Switch to"
-msgstr ""
+msgstr "Switch to"
#: db_qbe.php:186
msgid "visual builder"
-msgstr ""
+msgstr "visual builder"
#: db_qbe.php:219 libraries/db_structure.lib.php:95
#: libraries/display_tbl.lib.php:860
@@ -1099,7 +1099,7 @@ msgstr "Choose column to display"
#: js/messages.php:98
msgid "Add an option for column "
-msgstr ""
+msgstr "Add an option for column "
#: js/messages.php:101
msgid "Generate password"
@@ -6898,10 +6898,9 @@ msgid "Import/Export coordinates for PDF schema"
msgstr "Import/Export coordinates for PDF schema"
#: pmd_general.php:122
-#, fuzzy
#| msgid "Submit Query"
msgid "Build Query"
-msgstr "Submit Query"
+msgstr "Build Query"
#: pmd_general.php:127
msgid "Move Menu"
@@ -6924,42 +6923,36 @@ msgid "Delete relation"
msgstr "Delete relation"
#: pmd_general.php:462 pmd_general.php:521
-#, fuzzy
#| msgid "Relation deleted"
msgid "Relation operator"
-msgstr "Relation deleted"
+msgstr "Relation operator"
#: pmd_general.php:472 pmd_general.php:531 pmd_general.php:654
#: pmd_general.php:771
-#, fuzzy
#| msgid "Export"
msgid "Except"
-msgstr "Export"
+msgstr "Except"
#: pmd_general.php:478 pmd_general.php:537 pmd_general.php:660
#: pmd_general.php:777
-#, fuzzy
#| msgid "in query"
msgid "subquery"
-msgstr "in query"
+msgstr "subquery"
#: pmd_general.php:482 pmd_general.php:578
-#, fuzzy
#| msgid "Rename view to"
msgid "Rename to"
-msgstr "Rename view to"
+msgstr "Rename to"
#: pmd_general.php:484 pmd_general.php:583
-#, fuzzy
#| msgid "User name"
msgid "New name"
-msgstr "User name"
+msgstr "New name"
#: pmd_general.php:487 pmd_general.php:702
-#, fuzzy
#| msgid "Create"
msgid "Aggregate"
-msgstr "Create"
+msgstr "Aggregate"
#: pmd_general.php:489 pmd_general.php:509 pmd_general.php:631
#: pmd_general.php:644 pmd_general.php:707 pmd_general.php:761
@@ -6968,10 +6961,9 @@ msgid "Operator"
msgstr "Operator"
#: pmd_general.php:812
-#, fuzzy
#| msgid "Table options"
msgid "Active options"
-msgstr "Table options"
+msgstr "Active options"
#: pmd_help.php:26
msgid "To select relation, click :"
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list