Merge remote-tracking branch 'weblate/master'

Conflicts:
	po/es.po
	po/et.po
This commit is contained in:
Michal Čihař 2012-05-01 20:43:28 +02:00
commit 13f8b4a6ec
2 changed files with 16 additions and 16 deletions

View File

@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-05-01 20:40+0200\n"
"PO-Revision-Date: 2012-05-01 20:02+0200\n"
"POT-Creation-Date: 2012-05-01 18:03+0200\n"
"PO-Revision-Date: 2012-05-01 20:27+0200\n"
"Last-Translator: Matías Bellone <matiasbellone@gmail.com>\n"
"Language-Team: spanish <es@li.org>\n"
"Language: es\n"

View File

@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-05-01 20:40+0200\n"
"PO-Revision-Date: 2012-04-28 19:03+0200\n"
"POT-Creation-Date: 2012-05-01 18:03+0200\n"
"PO-Revision-Date: 2012-05-01 20:38+0200\n"
"Last-Translator: LiivaneLord <liivane.lord@mail.ee>\n"
"Language-Team: estonian <et@li.org>\n"
"Language: et\n"
@ -2332,10 +2332,10 @@ msgid "Failed running test for rule '%s'"
msgstr "Testi käivitamine reeglile '%s' ebaõnnestus"
#: libraries/Advisor.class.php:207
#, fuzzy, php-format
#, php-format
#| msgid "Failed formatting string for rule '%s'"
msgid "Failed formatting string for rule '%s'."
msgstr "Sõne vormindamine reeglile '%s' ebaõnnestus"
msgstr "Sõne vormindamine reeglile '%s' ebaõnnestus."
#: libraries/Advisor.class.php:383 server_status.php:963
msgid "per second"
@ -2714,17 +2714,17 @@ msgstr ""
msgid "An alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE"
msgstr "An alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE"
#: libraries/Types.class.php:307 libraries/Types.class.php:716
#, fuzzy, php-format
#: libraries/Types.class.php:307
#, php-format
#| msgid "authored on %1$s by %2$s"
msgid "A date, supported range is %1$s to %2$s"
msgstr "authored on %1$s by %2$s"
msgstr "Kuupäev, sobiv ulatus on %1$s kuni %2$s"
#: libraries/Types.class.php:309 libraries/Types.class.php:718
#, fuzzy, php-format
#: libraries/Types.class.php:309
#, php-format
#| msgid "A date and time combination, supported range is \"%1$s\" to \"%2$s\""
msgid "A date and time combination, supported range is %1$s to %2$s"
msgstr "Kuupäeva ja aja kombinatsioon, sobiv ulatus on \"%1$s\" kuni \"%2$s\""
msgstr "Kuupäeva ja aja kombinatsioon, sobiv ulatus on %1$s kuni %2$s"
#: libraries/Types.class.php:311
msgid ""
@ -2736,10 +2736,10 @@ msgstr ""
"(\"1970-01-01 00:00:00\" UTC)"
#: libraries/Types.class.php:313
#, fuzzy, php-format
#, php-format
#| msgid "Error renaming table %1$s to %2$s"
msgid "A time, range is %1$s to %2$s"
msgstr "Esines viga %1$s tabeli ümbernimetamisel nimeks %2$s"
msgstr "Aeg, ulatus on %1$s kuni %2$s"
#: libraries/Types.class.php:315
msgid ""
@ -7165,10 +7165,10 @@ msgid "This plugin does not support compressed imports!"
msgstr "See plugin ei toeta tihendatud importe!"
#: libraries/import/mediawiki.php:246
#, fuzzy, php-format
#, php-format
#| msgid "Invalid format of CSV input on line %d."
msgid "Invalid format of mediawiki input on line: <br />%s."
msgstr "Vale CSV sisendi formaat %d.-ndal real."
msgstr "Vale mediawiki sisendi formaat real: <br />%s."
#: libraries/import/ods.php:35
msgid "Import percentages as proper decimals <i>(ex. 12.00% to .12)</i>"