Merge remote-tracking branch 'weblate/master'

Conflicts:
	po/es.po
	po/ko.po
	po/pt_BR.po
This commit is contained in:
Michal Čihař 2013-05-23 11:54:19 +02:00
commit 0375021531
4 changed files with 37 additions and 30 deletions

View File

@ -3,11 +3,11 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2013-05-23 02:58-0400\n"
"PO-Revision-Date: 2013-05-20 15:47+0200\n"
"POT-Creation-Date: 2013-05-21 14:02+0200\n"
"PO-Revision-Date: 2013-05-22 01:30+0200\n"
"Last-Translator: Matías Bellone <matiasbellone+weblate@gmail.com>\n"
"Language-Team: Spanish <http://l10n.cihar.com/projects/phpmyadmin/master/es/"
">\n"
"Language-Team: Spanish "
"<http://l10n.cihar.com/projects/phpmyadmin/master/es/>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -12584,7 +12584,7 @@ msgstr "¡El nombre de la clave primaria tiene que ser «PRIMARY»!"
#: tbl_indexes.php:81
msgid "Can't rename index to PRIMARY!"
msgstr "No se puede cambiar el nombre del índice a PRIMARY!"
msgstr "¡No se puede cambiar el nombre del índice a PRIMARY!"
#: tbl_indexes.php:97
msgid "No index parts defined!"

View File

@ -3,11 +3,10 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2013-05-23 02:58-0400\n"
"PO-Revision-Date: 2013-05-17 07:41+0200\n"
"Last-Translator: Yungu Kim <crimsonpi@gmail.com>\n"
"Language-Team: Korean <http://l10n.cihar.com/projects/phpmyadmin/master/ko/"
">\n"
"POT-Creation-Date: 2013-05-21 14:02+0200\n"
"PO-Revision-Date: 2013-05-22 09:16+0200\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: Korean <http://l10n.cihar.com/projects/phpmyadmin/master/ko/>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -8767,7 +8766,7 @@ msgstr ""
#, php-format
msgid "%d row affected by the last statement inside the procedure"
msgid_plural "%d rows affected by the last statement inside the procedure"
msgstr[0] ""
msgstr[0] "프로시저 수행 중 가장 최근의 구문에 의해 %d개의 로우가 영향을 받음"
#: libraries/rte/rte_routines.lib.php:1505
#: libraries/rte/rte_routines.lib.php:1513
@ -10345,11 +10344,11 @@ msgid "Character Sets and Collations"
msgstr ""
#: server_databases.php:117
#, fuzzy, php-format
#, php-format
#| msgid "Your SQL query has been executed successfully"
msgid "%1$d database has been dropped successfully."
msgid_plural "%1$d databases have been dropped successfully."
msgstr[0] "질의가 성공적으로 실행되었습니다."
msgstr[0] "%1$d개의 데이터베이스를 삭제했습니다."
#: server_databases.php:138
msgid "Databases statistics"
@ -10863,18 +10862,18 @@ msgid "Query analyzer"
msgstr "질의 분석기"
#: server_status_monitor.php:654
#, fuzzy, php-format
#, php-format
#| msgid "per second"
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "초"
msgstr[0] "%d 초"
#: server_status_monitor.php:657
#, fuzzy, php-format
#, php-format
#| msgid "per minute"
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "분"
msgstr[0] "%d 분"
#: server_status_monitor.php:674
msgid "Start Monitor"

View File

@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2013-05-23 02:58-0400\n"
"PO-Revision-Date: 2013-05-21 10:21+0200\n"
"POT-Creation-Date: 2013-05-21 14:02+0200\n"
"PO-Revision-Date: 2013-05-22 11:07+0200\n"
"Last-Translator: Dieter Adriaenssens <ruleant@users.sourceforge.net>\n"
"Language-Team: Dutch <http://l10n.cihar.com/projects/phpmyadmin/master/nl/>\n"
"MIME-Version: 1.0\n"
@ -6276,12 +6276,15 @@ msgid ""
"is installed does not have direct access to the internet. The format is: "
"\"hostname:portnumber\""
msgstr ""
"De url voor de proxy die gebruikt moet worden bij het ophalen van de "
"informatie over de meest recente versie van phpMyAdmin. U heeft dit nodig "
"als de server waarop phpMyAdmin geïnstalleerd is geen directe toegang tot "
"het internet heeft. Het formaat is: \"servernaam:poortnummer\""
#: libraries/config/messages.inc.php:523
#, fuzzy
#| msgid "Version check"
msgid "Version check proxy url"
msgstr "Versiecontrole"
msgstr "Versiecontrole proxy url"
#: libraries/config/messages.inc.php:524
msgid ""
@ -6291,20 +6294,18 @@ msgid ""
msgstr ""
#: libraries/config/messages.inc.php:525
#, fuzzy
#| msgid "Version check"
msgid "Version check proxy username"
msgstr "Versiecontrole"
msgstr "Versiecontrole proxy gebruikersnaam"
#: libraries/config/messages.inc.php:526
msgid "The password for authenticating with the proxy"
msgstr ""
#: libraries/config/messages.inc.php:527
#, fuzzy
#| msgid "Version check"
msgid "Version check proxy password"
msgstr "Versiecontrole"
msgstr "Versiecontrole proxy wachtwoord"
#: libraries/config/messages.inc.php:529
msgid ""

View File

@ -3,11 +3,11 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2013-05-23 02:58-0400\n"
"PO-Revision-Date: 2013-05-07 18:01+0200\n"
"Last-Translator: Rodrigo Souza <rodrigo.chrome@live.com>\n"
"Language-Team: Portuguese (Brazil) <http://l10n.cihar.com/projects/"
"phpmyadmin/master/pt_BR/>\n"
"POT-Creation-Date: 2013-05-21 14:02+0200\n"
"PO-Revision-Date: 2013-05-22 01:52+0200\n"
"Last-Translator: Airton Torres <airton.torres@gmail.com>\n"
"Language-Team: Portuguese (Brazil) "
"<http://l10n.cihar.com/projects/phpmyadmin/master/pt_BR/>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -6276,6 +6276,10 @@ msgid ""
"is installed does not have direct access to the internet. The format is: "
"\"hostname:portnumber\""
msgstr ""
"A url do proxy a ser usado para recuperar inormações sobre a última versão "
"do phpMyAdmin. Voce precisará disto se o servidor onde o phpMyAdmin está "
"instalado não tiver acesso direto à internet. O formato é: "
"\"hostname:portnumber\""
#: libraries/config/messages.inc.php:523
#, fuzzy
@ -6289,6 +6293,9 @@ msgid ""
"authentication is performed. If a username is supplied, Basic Authentication "
"will be performed. No other types of authentication are currently supported."
msgstr ""
"O usuário para autenticar no proxy. Por padrão, nenhuma autenticação é "
"efetuada. Se for fornecido um usuário, será efetuada uma Autenticação "
"Básica. Nenhum outro tipo de autenticação é suportado atualmente."
#: libraries/config/messages.inc.php:525
#, fuzzy