The branch, master has been updated via a6facee514dce369580cff6106cd80bf9858ab43 (commit) via be647830b106bcae0aba30d6b266b3abce7018db (commit) via fe490994216b5e27ad939b057d754f649dc42ac4 (commit) via 4c84d05dfb7bd14c5b46b6ca4bae5d838a05b320 (commit) via ecf070104d007ed5d8ca7daef86c74ba8833d2cb (commit) via d3e17ad6bbb41446e2ca92aefb7246c7a722047c (commit) via 2823a7f4a07f86f56a1a09606e454062b62b6d40 (commit) via b33238b02a99738d0af03612ba9f5ac118f9c6cc (commit) from 6a4388f1ef0eae3a41e80f6038e942f84e4558bf (commit)
- Log ----------------------------------------------------------------- commit a6facee514dce369580cff6106cd80bf9858ab43 Merge: be647830b106bcae0aba30d6b266b3abce7018db fe490994216b5e27ad939b057d754f649dc42ac4 Author: Michal Čihař mcihar@suse.cz Date: Wed Jun 22 10:08:35 2011 +0200
Merge remote-tracking branch 'pootle/master'
Conflicts: po/br.po
commit be647830b106bcae0aba30d6b266b3abce7018db Author: Michal Čihař mcihar@suse.cz Date: Wed Jun 22 10:08:13 2011 +0200
Define language for manuals
commit fe490994216b5e27ad939b057d754f649dc42ac4 Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Wed Jun 22 10:08:02 2011 +0200
Translation update done using Pootle.
commit 4c84d05dfb7bd14c5b46b6ca4bae5d838a05b320 Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Wed Jun 22 10:07:56 2011 +0200
Translation update done using Pootle.
commit ecf070104d007ed5d8ca7daef86c74ba8833d2cb Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Wed Jun 22 10:07:46 2011 +0200
Translation update done using Pootle.
commit d3e17ad6bbb41446e2ca92aefb7246c7a722047c Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Wed Jun 22 10:07:31 2011 +0200
Translation update done using Pootle.
commit 2823a7f4a07f86f56a1a09606e454062b62b6d40 Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Wed Jun 22 10:06:55 2011 +0200
Translation update done using Pootle.
commit b33238b02a99738d0af03612ba9f5ac118f9c6cc Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Wed Jun 22 10:06:40 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/br.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/po/br.po b/po/br.po index 1e32bb2..5a3aa17 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-22 09:31+0200\n" -"PO-Revision-Date: 2011-06-22 10:05+0200\n" +"PO-Revision-Date: 2011-06-22 10:08+0200\n" "Last-Translator: fulup.jakez@ofis-bzh.org\n" "Language-Team: LANGUAGE LL@li.org\n" "Language: br\n" @@ -411,20 +411,20 @@ msgstr "Gwiriadenn ziwezhañ" #, php-format msgid "%s table" msgid_plural "%s tables" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s daolenn" +msgstr[1] "%s taolenn"
#: db_qbe.php:41 msgid "You have to choose at least one column to display" -msgstr "" +msgstr "Ret eo deoc'h dibab da nebeutañ ur bann da vezañ diskwelet"
#: db_qbe.php:186 msgid "Switch to" -msgstr "" +msgstr "Mont da"
#: db_qbe.php:186 msgid "visual builder" -msgstr "" +msgstr "mod gwelet"
#: db_qbe.php:222 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:927 @@ -2098,19 +2098,19 @@ msgstr "" #: libraries/common.lib.php:386 msgctxt "MySQL 5.5 documentation language" msgid "en" -msgstr "" +msgstr "en"
#. l10n: Language to use for MySQL 5.1 documentation, please use only languages which do exist in official documentation. #: libraries/common.lib.php:390 msgctxt "MySQL 5.1 documentation language" msgid "en" -msgstr "" +msgstr "en"
#. l10n: Language to use for MySQL 5.0 documentation, please use only languages which do exist in official documentation. #: libraries/common.lib.php:394 msgctxt "MySQL 5.0 documentation language" msgid "en" -msgstr "" +msgstr "en"
#: libraries/common.lib.php:407 libraries/common.lib.php:409 #: libraries/common.lib.php:411 libraries/common.lib.php:426 @@ -4465,7 +4465,7 @@ msgstr "" #: libraries/core.lib.php:264 msgctxt "PHP documentation language" msgid "en" -msgstr "" +msgstr "en"
#: libraries/core.lib.php:278 #, php-format
hooks/post-receive