The branch, master has been updated via 6f61a155d1616f9d08a67e113628773a6ffe301c (commit) via abc6c4a81baed2fcc642bfd4873fe3a637e58e9b (commit) via 5621a1de9e0480e7fbcf64c350347a4dc232f810 (commit) via 0f0bef136fe1c7da3551f7f3005a86d6352fc4a3 (commit) via 70dd154a5e67fb0e97959fc8ac4e59f1e43878e8 (commit) via 35e3adff49773bc1b01bd6b20526b59afe42a4c6 (commit) via 6d40731a216363534844e10bb313ad2194e99f0d (commit) via 7bfe01fbae9c5b585283afc5a2e7ee52e43bbce0 (commit) via dc6250a31831a72c85cfe712d9c4bf29a25dad93 (commit) via 1dfdcefae91a0ad52a8b347d7e9e79a83293b60e (commit) via c863879cdf7e3d0af094d18009fb601c45ebec74 (commit) via fc6b0bdba15c9c37cff913831974b74d07e2a274 (commit) via 15c4018a1b575f1e2b6e8e038cea72fc023898cb (commit) via a10c34c3ae99abf56a3acf42d2ce84bb9277bd8e (commit) via 9a8ac1e172aa29a23df4ab1611528b97e26baf07 (commit) via 2c1a7cd639d4d42d0b2c9a44dabf50720f69d651 (commit) via e56fca5f1db2b157537a14229faffb36ec90f1c6 (commit) via 95abdcebfd693c3952ce237845029a61825eca2d (commit) via 60eaa3241fa6a91b88eacc8791f3cb2c697014e1 (commit) via 4834e39b4e09786f2ae43bcdd6c71695c0859eb5 (commit) via c0e898d39470a72f2d0edff81b7e0b1faade4524 (commit) from 4b7ae52fc6b25d5dd286443b9dac04432035f36c (commit)
- Log ----------------------------------------------------------------- commit 6f61a155d1616f9d08a67e113628773a6ffe301c Merge: 4b7ae52fc6b25d5dd286443b9dac04432035f36c abc6c4a81baed2fcc642bfd4873fe3a637e58e9b Author: Michal Čihař mcihar@suse.cz Date: Fri Jun 24 12:56:14 2011 +0200
Merge remote-tracking branch 'pootle/master'
Conflicts: po/br.po
commit abc6c4a81baed2fcc642bfd4873fe3a637e58e9b Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:54:43 2011 +0200
Translation update done using Pootle.
commit 5621a1de9e0480e7fbcf64c350347a4dc232f810 Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:54:30 2011 +0200
Translation update done using Pootle.
commit 0f0bef136fe1c7da3551f7f3005a86d6352fc4a3 Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:51:57 2011 +0200
Translation update done using Pootle.
commit 70dd154a5e67fb0e97959fc8ac4e59f1e43878e8 Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:50:22 2011 +0200
Translation update done using Pootle.
commit 35e3adff49773bc1b01bd6b20526b59afe42a4c6 Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:47:29 2011 +0200
Translation update done using Pootle.
commit 6d40731a216363534844e10bb313ad2194e99f0d Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:47:16 2011 +0200
Translation update done using Pootle.
commit 7bfe01fbae9c5b585283afc5a2e7ee52e43bbce0 Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:47:05 2011 +0200
Translation update done using Pootle.
commit dc6250a31831a72c85cfe712d9c4bf29a25dad93 Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:46:52 2011 +0200
Translation update done using Pootle.
commit 1dfdcefae91a0ad52a8b347d7e9e79a83293b60e Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:46:11 2011 +0200
Translation update done using Pootle.
commit c863879cdf7e3d0af094d18009fb601c45ebec74 Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:44:09 2011 +0200
Translation update done using Pootle.
commit fc6b0bdba15c9c37cff913831974b74d07e2a274 Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:42:37 2011 +0200
Translation update done using Pootle.
commit 15c4018a1b575f1e2b6e8e038cea72fc023898cb Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:42:26 2011 +0200
Translation update done using Pootle.
commit a10c34c3ae99abf56a3acf42d2ce84bb9277bd8e Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:41:18 2011 +0200
Translation update done using Pootle.
commit 9a8ac1e172aa29a23df4ab1611528b97e26baf07 Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:40:44 2011 +0200
Translation update done using Pootle.
commit 2c1a7cd639d4d42d0b2c9a44dabf50720f69d651 Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:40:02 2011 +0200
Translation update done using Pootle.
commit e56fca5f1db2b157537a14229faffb36ec90f1c6 Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:38:59 2011 +0200
Translation update done using Pootle.
commit 95abdcebfd693c3952ce237845029a61825eca2d Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:04:58 2011 +0200
Translation update done using Pootle.
commit 60eaa3241fa6a91b88eacc8791f3cb2c697014e1 Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:04:11 2011 +0200
Translation update done using Pootle.
commit 4834e39b4e09786f2ae43bcdd6c71695c0859eb5 Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:03:22 2011 +0200
Translation update done using Pootle.
commit c0e898d39470a72f2d0edff81b7e0b1faade4524 Author: fulup.jakez fulup.jakez@ofis-bzh.org Date: Fri Jun 24 12:03:15 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/br.po | 46 +++++++++++++++++++++++++++++++--------------- 1 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/po/br.po b/po/br.po index bee7a2b..2344885 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-24 12:07+0200\n" -"PO-Revision-Date: 2011-06-24 11:46+0200\n" +"PO-Revision-Date: 2011-06-24 12:54+0200\n" "Last-Translator: fulup.jakez@ofis-bzh.org\n" "Language-Team: LANGUAGE LL@li.org\n" "Language: br\n" @@ -922,40 +922,42 @@ msgstr "Merkañ pep talvoud en ur vaezienn a-ziforc'h."
#: enum_editor.php:57 msgid "+ Restart insertion and add a new value" -msgstr "" +msgstr "+ Adkregiñ gant an ensoc'hañ hag ouzhpennañ un talvoud nevez"
#: enum_editor.php:67 msgid "Output" -msgstr "" +msgstr "Disoc'h"
#: enum_editor.php:68 msgid "Copy and paste the joined values into the "Length/Values" field" -msgstr "" +msgstr "Eilañ an talvoudoù ha pegañ anezho er vaezienn "Ment/Talvoudoù""
#: export.php:73 msgid "Selected export type has to be saved in file!" -msgstr "" +msgstr "Ret eo enrollañ an diuzadenn ezporzhiañ en ur restr !"
#: export.php:164 export.php:189 export.php:671 #, php-format msgid "Insufficient space to save the file %s." -msgstr "" +msgstr "N'eus ket egor a-walc'h evit gallout enrollañ ar restr %s."
#: export.php:307 #, php-format msgid "" "File %s already exists on server, change filename or check overwrite option." msgstr "" +"Emañ ar restr %s war ar servijer dija; cheñch an anv pe klikañ war al log " +"frikañ ar restroù zo dija."
#: export.php:311 export.php:315 #, php-format msgid "The web server does not have permission to save the file %s." -msgstr "" +msgstr "N'eo ket aotreet ar servijer web da enrollañ ar restr %s."
#: export.php:673 #, php-format msgid "Dump has been saved to file %s." -msgstr "" +msgstr "Enrollet eo bet ar restr ezporzhiañ e%s."
#: import.php:58 #, php-format @@ -963,11 +965,13 @@ msgid "" "You probably tried to upload too large file. Please refer to %sdocumentation" "%s for ways to workaround this limit." msgstr "" +"Evit doare hoc'h eus klasket enrollañ ur restr re vras. Sellit ouzh an %" +"steulioù titouriñ%s evit gwelet penaos c'hoari an dro d'ar vevenn-se."
#: import.php:278 import.php:331 libraries/File.class.php:501 #: libraries/File.class.php:611 msgid "File could not be read" -msgstr "" +msgstr "N'haller ket lenn ar restr"
#: import.php:286 import.php:295 import.php:314 import.php:323 #: libraries/File.class.php:681 libraries/File.class.php:689 @@ -977,6 +981,9 @@ msgid "" "You attempted to load file with unsupported compression (%s). Either support " "for it is not implemented or disabled by your configuration." msgstr "" +"Klasket hoc'h eus enporzhiañ ur restr n'eo ket skoret ar mod m'eo bet " +"gwasket (%s). Pe n'eo ket emplementet ar mod gwaskañ-se en ho kefluniadur, " +"pe eo bet diweredekaet."
#: import.php:336 msgid "" @@ -984,45 +991,54 @@ msgid "" "file size exceeded the maximum size permitted by your PHP configuration. See " "[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]." msgstr "" +"N'eus bet resevet roadenn ebet da vezañ enporzhiet. Pe n'eus bet pourchaset " +"anv restr ebet pe ez a ar vent anezhi dreist d'ar vent vrasañ aotreet gant " +"ho kefluniadur PHP. Gwelet [a@./Documentation.html#faq1_16@Documentation]FAQ " +"1.16[/a]."
#: import.php:371 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" -msgstr "" +msgstr "Dibosupl enporzhiañ an adveziantoù. Gwiriit ho staliadur !"
#: import.php:396 msgid "The bookmark has been deleted." -msgstr "" +msgstr "Diverket eo bet ar sined."
#: import.php:400 msgid "Showing bookmark" -msgstr "" +msgstr "O tiskouez ar sined"
#: import.php:402 sql.php:970 #, php-format msgid "Bookmark %s created" -msgstr "" +msgstr "Krouet eo bet ar sined %s"
#: import.php:408 import.php:414 #, php-format msgid "Import has been successfully finished, %d queries executed." -msgstr "" +msgstr "Enporzhiet eo bet an traoù ervat, %d reked zo bet kaset da benn."
#: import.php:423 msgid "" "Script timeout passed, if you want to finish import, please resubmit same " "file and import will resume." msgstr "" +"Aet eur dreist d'ar vevenn amzer. Mar fell deoc'h kenderc'hel gant an " +"enporzhiañ, adkasit ar restr hag e kendalc'ho an argerzh."
#: import.php:425 msgid "" "However on last run no data has been parsed, this usually means phpMyAdmin " "won't be able to finish this import unless you increase php time limits." msgstr "" +"Koulskoude n'eus ket bet dielfennet roadenn ebet er gasadenn ziwezhañ. " +"Peurliesañ e talvez n'hallo ket PhpMyAdmin echuiñ da enporzhiañ an traoù ma " +"ne vez ket kresket ganeoc'h bevenn amzer PHP."
#: import_status.php:30 libraries/common.lib.php:650 #: libraries/schema/Export_Relation_Schema.class.php:203 user_password.php:123 msgid "Back" -msgstr "" +msgstr "Distreiñ"
#: index.php:183 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
hooks/post-receive