[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1597-gec0feca
Michal Čihař
nijel at users.sourceforge.net
Thu May 19 09:40:21 CEST 2011
The branch, master has been updated
via ec0feca1f52d1443de5e5d42a80fc2f249c10195 (commit)
via 0d4cf5d9f1f755b020650e4697ffe8cceafe3c0e (commit)
via c63efe8efdb5b3eea443e59211f597ec38a807f6 (commit)
via 2efdd9edf38dc60d7bd4d4aa7673f338b155add3 (commit)
via e1460ca222cdc85fa118bcf7681b1a82b46ccee8 (commit)
via f9ec88c8561d72b9c84ad90d1ffa48c7b4d4dc33 (commit)
via daa8b081389aef5c6d6e5b9cb4f6f0b5f40ff070 (commit)
via 7d47d4c3d2c7129312306f418e6d1764062ff74b (commit)
via 0bda6e29f5aa9ad885c49f369ae1eabb2e409427 (commit)
via f54365fa503c2cbe553e94b4f1472edd90357746 (commit)
via 28129787de1ed7aefd765556f93f07d7182ea4c9 (commit)
via fc0a8987d71a16261ec9aeabdbade32c47f516b9 (commit)
via d8eb19755a57e9ade950883c52f1533df4e711fc (commit)
via 56658368c08807fad0d15e29e9c22cdc848e5ba0 (commit)
via 67a8250f418823a8bf6790e0b72d77c14f25f4a2 (commit)
via 15ed6df1b5c13f2d432d04f33a172ce6c4826bb9 (commit)
via e4e3beeb845c23656cd040e89b62507d1068cc95 (commit)
via 19a837b15921f8bd4f8c742892a7ce80d9ac88cb (commit)
via ca30d738941fcd51d3a94564b961d1624ec8bf0f (commit)
via fdee3c0104b0a9cea41f26eab3f3240d607e18c5 (commit)
via 85d8e0141f9b4ab2681f7ec33cad0f56b239fa2a (commit)
via f32887f18a70592b8bce94b8b17a7ec51c8118c6 (commit)
via f80377acf7b8da5dd28a9214bb36c950ccf74ae8 (commit)
via ac58dabda8ed5ed700a07a0773b9e45e7588dced (commit)
via 00626bcd98607ae63e68984a74db6f7985556de2 (commit)
via 8307d40f2fd5f64608c3d7569fd4244386fa8b59 (commit)
via 927a811c083ba01bba5d426aa9842d1b4d217ac9 (commit)
from 39d85a3134c7e5feb2a968333eb6b04f95e69456 (commit)
- Log -----------------------------------------------------------------
commit ec0feca1f52d1443de5e5d42a80fc2f249c10195
Merge: 39d85a3134c7e5feb2a968333eb6b04f95e69456 0d4cf5d9f1f755b020650e4697ffe8cceafe3c0e
Author: Michal Čihař <mcihar at novell.com>
Date: Thu May 19 09:40:05 2011 +0200
Merge remote-tracking branch 'pootle/master'
Conflicts:
po/bg.po
po/en_GB.po
po/fr.po
commit 0d4cf5d9f1f755b020650e4697ffe8cceafe3c0e
Author: stoyanster <stoyanster at gmail.com>
Date: Thu May 19 08:30:54 2011 +0200
Translation update done using Pootle.
commit c63efe8efdb5b3eea443e59211f597ec38a807f6
Author: stoyanster <stoyanster at gmail.com>
Date: Thu May 19 08:29:27 2011 +0200
Translation update done using Pootle.
commit 2efdd9edf38dc60d7bd4d4aa7673f338b155add3
Author: stoyanster <stoyanster at gmail.com>
Date: Thu May 19 08:29:01 2011 +0200
Translation update done using Pootle.
commit e1460ca222cdc85fa118bcf7681b1a82b46ccee8
Author: stoyanster <stoyanster at gmail.com>
Date: Thu May 19 08:28:09 2011 +0200
Translation update done using Pootle.
commit f9ec88c8561d72b9c84ad90d1ffa48c7b4d4dc33
Author: stoyanster <stoyanster at gmail.com>
Date: Thu May 19 08:24:44 2011 +0200
Translation update done using Pootle.
commit daa8b081389aef5c6d6e5b9cb4f6f0b5f40ff070
Author: stoyanster <stoyanster at gmail.com>
Date: Thu May 19 08:22:05 2011 +0200
Translation update done using Pootle.
commit 7d47d4c3d2c7129312306f418e6d1764062ff74b
Author: stoyanster <stoyanster at gmail.com>
Date: Thu May 19 08:18:06 2011 +0200
Translation update done using Pootle.
commit 0bda6e29f5aa9ad885c49f369ae1eabb2e409427
Author: stoyanster <stoyanster at gmail.com>
Date: Thu May 19 08:16:17 2011 +0200
Translation update done using Pootle.
commit f54365fa503c2cbe553e94b4f1472edd90357746
Author: stoyanster <stoyanster at gmail.com>
Date: Thu May 19 08:13:04 2011 +0200
Translation update done using Pootle.
commit 28129787de1ed7aefd765556f93f07d7182ea4c9
Author: stoyanster <stoyanster at gmail.com>
Date: Thu May 19 08:11:29 2011 +0200
Translation update done using Pootle.
commit fc0a8987d71a16261ec9aeabdbade32c47f516b9
Author: stoyanster <stoyanster at gmail.com>
Date: Thu May 19 08:09:13 2011 +0200
Translation update done using Pootle.
commit d8eb19755a57e9ade950883c52f1533df4e711fc
Author: stoyanster <stoyanster at gmail.com>
Date: Thu May 19 08:07:15 2011 +0200
Translation update done using Pootle.
commit 56658368c08807fad0d15e29e9c22cdc848e5ba0
Author: stoyanster <stoyanster at gmail.com>
Date: Thu May 19 08:06:42 2011 +0200
Translation update done using Pootle.
commit 67a8250f418823a8bf6790e0b72d77c14f25f4a2
Author: stoyanster <stoyanster at gmail.com>
Date: Thu May 19 08:05:39 2011 +0200
Translation update done using Pootle.
commit 15ed6df1b5c13f2d432d04f33a172ce6c4826bb9
Author: stoyanster <stoyanster at gmail.com>
Date: Thu May 19 08:05:31 2011 +0200
Translation update done using Pootle.
commit e4e3beeb845c23656cd040e89b62507d1068cc95
Author: stoyanster <stoyanster at gmail.com>
Date: Thu May 19 08:04:08 2011 +0200
Translation update done using Pootle.
commit 19a837b15921f8bd4f8c742892a7ce80d9ac88cb
Author: stoyanster <stoyanster at gmail.com>
Date: Thu May 19 08:03:09 2011 +0200
Translation update done using Pootle.
commit ca30d738941fcd51d3a94564b961d1624ec8bf0f
Author: stoyanster <stoyanster at gmail.com>
Date: Thu May 19 08:02:50 2011 +0200
Translation update done using Pootle.
commit fdee3c0104b0a9cea41f26eab3f3240d607e18c5
Author: stoyanster <stoyanster at gmail.com>
Date: Thu May 19 08:01:51 2011 +0200
Translation update done using Pootle.
commit 85d8e0141f9b4ab2681f7ec33cad0f56b239fa2a
Author: Marc Delisle <marc at infomarc.info>
Date: Wed May 18 17:49:51 2011 +0200
Translation update done using Pootle.
commit f32887f18a70592b8bce94b8b17a7ec51c8118c6
Author: Marc Delisle <marc at infomarc.info>
Date: Wed May 18 17:49:47 2011 +0200
Translation update done using Pootle.
commit f80377acf7b8da5dd28a9214bb36c950ccf74ae8
Author: Marc Delisle <marc at infomarc.info>
Date: Wed May 18 17:49:38 2011 +0200
Translation update done using Pootle.
commit ac58dabda8ed5ed700a07a0773b9e45e7588dced
Author: Marc Delisle <marc at infomarc.info>
Date: Wed May 18 17:49:19 2011 +0200
Translation update done using Pootle.
commit 00626bcd98607ae63e68984a74db6f7985556de2
Author: Marc Delisle <marc at infomarc.info>
Date: Wed May 18 17:49:12 2011 +0200
Translation update done using Pootle.
commit 8307d40f2fd5f64608c3d7569fd4244386fa8b59
Author: Marc Delisle <marc at infomarc.info>
Date: Wed May 18 17:48:42 2011 +0200
Translation update done using Pootle.
commit 927a811c083ba01bba5d426aa9842d1b4d217ac9
Author: Marc Delisle <marc at infomarc.info>
Date: Wed May 18 17:48:37 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/bg.po | 36 ++++++++++++++++++++++++------------
po/en_GB.po | 12 +++++-------
po/fr.po | 14 +++++---------
3 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/po/bg.po b/po/bg.po
index 82ff11d..e34bdfb 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-18 07:46-0400\n"
-"PO-Revision-Date: 2011-05-18 15:59+0200\n"
+"PO-Revision-Date: 2011-05-19 08:30+0200\n"
"Last-Translator: <stoyanster at gmail.com>\n"
"Language-Team: bulgarian <bg at li.org>\n"
"MIME-Version: 1.0\n"
@@ -96,15 +96,15 @@ msgstr "Използване тази стойност"
#: bs_disp_as_mime_type.php:29 bs_play_media.php:35
#: libraries/blobstreaming.lib.php:331
msgid "No blob streaming server configured!"
-msgstr ""
+msgstr "Няма зададен BLOB поточен сървър!"
#: bs_disp_as_mime_type.php:35
msgid "Failed to fetch headers"
-msgstr ""
+msgstr "Зареждането на заглавките се провали"
#: bs_disp_as_mime_type.php:41
msgid "Failed to open remote URL"
-msgstr ""
+msgstr "Отваряенто на отдалечения адрес се провали"
#: changelog.php:32 license.php:28
#, php-format
@@ -346,6 +346,8 @@ msgid ""
"The phpMyAdmin configuration storage has been deactivated. To find out why "
"click %shere%s."
msgstr ""
+"Хранилището за конфигурацията на phpMyAdmin е деактивирано. За да разберете "
+"защо натиснете %sтук%s."
#: db_operations.php:600
msgid "Edit or export relational schema"
@@ -614,7 +616,7 @@ msgstr "Проследяването е неактивно."
msgid ""
"This view has at least this number of rows. Please refer to %sdocumentation%"
"s."
-msgstr ""
+msgstr "Този изглед има поне толкова реда. Погледнете %sдокументацията%s"
#: db_structure.php:393 db_structure.php:407 libraries/header.inc.php:138
#: libraries/tbl_info.inc.php:60 tbl_structure.php:206 test/theme.php:73
@@ -809,7 +811,7 @@ msgstr "Въведете всяка стойност в отделно поле.
#: enum_editor.php:57
msgid "+ Restart insertion and add a new value"
-msgstr ""
+msgstr "+ Рестартиране на вмъкването и добавяне нова стойност"
#: enum_editor.php:67
msgid "Output"
@@ -818,6 +820,7 @@ msgstr "Изход"
#: enum_editor.php:68
msgid "Copy and paste the joined values into the \"Length/Values\" field"
msgstr ""
+"Копиране и поставяне на слепените стойности в полето \"Дължина/Стойности\""
#: export.php:73
msgid "Selected export type has to be saved in file!"
@@ -868,6 +871,8 @@ msgid ""
"You attempted to load file with unsupported compression (%s). Either support "
"for it is not implemented or disabled by your configuration."
msgstr ""
+"Опитвате да заредите файл с неподдържана компресия (%s). Или поддръжката ѝ "
+"не е реализирана, или е изключена от конфигурацията."
#: import.php:336
msgid ""
@@ -875,6 +880,9 @@ msgid ""
"file size exceeded the maximum size permitted by your PHP configuration. See "
"[a at ./Documentation.html#faq1_16 at Documentation]FAQ 1.16[/a]."
msgstr ""
+"Не бяха получени данни за импорт. Или не е изпратен файл, или файлът е бил "
+"по-голям от разрешеното в конфигурацията на PHP. Вижте "
+"[a at ./Documentation.html#faq1_16 at Documentation]ЧЗВ 1.16[/a]."
#: import.php:371 libraries/display_import.lib.php:23
msgid "Could not load import plugins, please check your installation!"
@@ -905,6 +913,8 @@ msgid ""
"Script timeout passed, if you want to finish import, please resubmit same "
"file and import will resume."
msgstr ""
+"Времето за изчакване на скрипта изтече. Ако искате да завършите импорта го "
+"пуснете отново и той ще си продължи."
#: import.php:425
msgid ""
@@ -983,7 +993,7 @@ msgstr "Операцията може да продължи дълго. Да п
#: js/messages.php:42
msgid "You are about to DISABLE a BLOB Repository!"
-msgstr ""
+msgstr "На път сте да ИЗКЛЮЧИТЕ BLOB хранилището!"
#: js/messages.php:43
#, php-format
@@ -1114,7 +1124,7 @@ msgstr "Изтриване"
#: js/messages.php:90
msgid ""
"Note: If the file contains multiple tables, they will be combined into one"
-msgstr ""
+msgstr "Заб.: Ако файлът съдържа няколко таблици, те ще бъдат обединени."
#: js/messages.php:93
msgid "Hide query box"
@@ -1494,7 +1504,7 @@ msgstr "Липсва временна папка."
#: libraries/File.class.php:322
msgid "Failed to write file to disk."
-msgstr ""
+msgstr "Запазването на файл на диска се провали."
#: libraries/File.class.php:325
msgid "File upload stopped by extension."
@@ -1509,6 +1519,8 @@ msgid ""
"Error moving the uploaded file, see [a at ./Documentation."
"html#faq1_11 at Documentation]FAQ 1.11[/a]"
msgstr ""
+"Грешка при преместване на качения файл, вж. "
+"[a at ./Documentation.html#faq1_11 at Documentation]ЧЗВ 1.11[/a]"
#: libraries/Index.class.php:427 tbl_relation.php:526
msgid "No index defined!"
@@ -2103,7 +2115,7 @@ msgstr "Показване БД "%s"."
#: libraries/common.lib.php:2466
#, php-format
msgid "The %s functionality is affected by a known bug, see %s"
-msgstr ""
+msgstr "Функционалността %s се влияе от известен дефект, вж. %s"
#: libraries/common.lib.php:2826 libraries/common.lib.php:2833
#: libraries/common.lib.php:3018 libraries/config/setup.forms.php:291
@@ -6326,7 +6338,7 @@ msgstr ""
#: libraries/tbl_properties.inc.php:104
msgid "Length/Values"
-msgstr "Дължина/Стойност*"
+msgstr "Дължина/Стойности"
#: libraries/tbl_properties.inc.php:104
msgid ""
@@ -8815,7 +8827,7 @@ msgstr "Ключът трябва да съдържа букви, цифри [em
#: sql.php:87 tbl_change.php:253 tbl_select.php:26 tbl_select.php:27
#: tbl_select.php:30 tbl_select.php:33
msgid "Browse foreign values"
-msgstr "Разглеждане за външни стойности"
+msgstr "Разглеждане на външни стойности"
#: sql.php:163
#, php-format
diff --git a/po/en_GB.po b/po/en_GB.po
index d312372..4e34b04 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-18 07:46-0400\n"
-"PO-Revision-Date: 2011-05-17 13:52+0200\n"
-"Last-Translator: Michal Čihař <michal at cihar.com>\n"
+"PO-Revision-Date: 2011-05-18 17:48+0200\n"
+"Last-Translator: Marc Delisle <marc at infomarc.info>\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"
@@ -1112,16 +1112,14 @@ msgid "Show search results"
msgstr "Show search results"
#: js/messages.php:86
-#, fuzzy
#| msgid "Browse"
msgid "Browsing"
-msgstr "Browse"
+msgstr "Browsing"
#: js/messages.php:87
-#, fuzzy
#| msgid "Deleting %s"
msgid "Deleting"
-msgstr "Deleting %s"
+msgstr "Deleting"
#: js/messages.php:90
msgid ""
diff --git a/po/fr.po b/po/fr.po
index abef4b1..eb46005 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-18 07:46-0400\n"
-"PO-Revision-Date: 2011-05-16 16:51+0200\n"
+"PO-Revision-Date: 2011-05-18 17:49+0200\n"
"Last-Translator: Marc Delisle <marc at infomarc.info>\n"
"Language-Team: french <fr at li.org>\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -1125,16 +1125,14 @@ msgid "Show search results"
msgstr "Afficher les résultats de recherche"
#: js/messages.php:86
-#, fuzzy
#| msgid "Browse"
msgid "Browsing"
-msgstr "Afficher"
+msgstr "Affichage en cours"
#: js/messages.php:87
-#, fuzzy
#| msgid "Deleting %s"
msgid "Deleting"
-msgstr "Destruction de %s"
+msgstr "Destruction en cours"
#: js/messages.php:90
msgid ""
@@ -8029,7 +8027,7 @@ msgid "Unable to change master"
msgstr "Impossible de changer le maître"
#: server_replication.php:72
-#, fuzzy, php-format
+#, php-format
#| msgid "Master server changed succesfully to %s"
msgid "Master server changed successfully to %s"
msgstr "Le serveur maître est maintenant %s"
@@ -10062,7 +10060,6 @@ msgid "Version %s snapshot (SQL code)"
msgstr "Instantané de la version %s (code SQL)"
#: tbl_tracking.php:382
-#, fuzzy
#| msgid "Tracking data definition succesfully deleted"
msgid "Tracking data definition successfully deleted"
msgstr "Le suivi des définitions de données a été effacé avec succès"
@@ -10072,7 +10069,6 @@ msgid "Query error"
msgstr "Erreur de requête"
#: tbl_tracking.php:399
-#, fuzzy
#| msgid "Tracking data manipulation succesfully deleted"
msgid "Tracking data manipulation successfully deleted"
msgstr "Le suivi des manipulations de données a été effacé avec succès"
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list