gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Madhura Jayaratne 2015-05-29 19:19:00 +05:30
commit 8fa3680da8
3 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
po/fr.po
View File

@ -4,14 +4,14 @@ msgstr ""
"Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2015-05-27 08:08-0400\n"
"PO-Revision-Date: 2015-05-25 16:29+0200\n"
"PO-Revision-Date: 2015-05-29 14:47+0200\n"
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: French <https://hosted.weblate.org/projects/phpmyadmin/master/"
"fr/>\n"
"Language-Team: French "
"<https://hosted.weblate.org/projects/phpmyadmin/master/fr/>\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: Weblate 2.3-dev\n"
@ -7522,19 +7522,17 @@ msgid "Show create database form"
msgstr "Afficher le formulaire de création de base de données"
#: libraries/config/messages.inc.php:749
#, fuzzy
#| msgid ""
#| "Show or hide a column displaying the Creation timestamp for all tables."
msgid "Show or hide a column displaying the comments for all tables."
msgstr ""
"Montrer ou cacher une colonne contenant la date de création pour toutes les "
"Montrer ou cacher une colonne affichant les commentaires pour toutes les "
"tables."
#: libraries/config/messages.inc.php:750
#, fuzzy
#| msgid "Table comments"
msgid "Show table comments"
msgstr "Commentaires sur la table"
msgstr "Montrer les commentaires de table"
#: libraries/config/messages.inc.php:751
msgid "Show or hide a column displaying the Creation timestamp for all tables."
@ -9211,10 +9209,9 @@ msgid "phpMyAdmin documentation"
msgstr "Documentation de phpMyAdmin"
#: libraries/navigation/NavigationHeader.class.php:192
#, fuzzy
#| msgid "Navigation panel"
msgid "Navigation panel settings"
msgstr "Panneau de navigation"
msgstr "Paramètres du panneau de navigation"
#: libraries/navigation/NavigationHeader.class.php:203
msgid "Reload navigation panel"
@ -9677,10 +9674,9 @@ msgstr "Renommer la base de données comme suit"
#: libraries/operations.lib.php:795 libraries/operations.lib.php:1026
#: libraries/operations.lib.php:1187 libraries/rte/rte_routines.lib.php:1101
#: libraries/tbl_columns_definition_form.lib.php:344
#, fuzzy
#| msgid "Edit Privileges"
msgid "Adjust Privileges"
msgstr "Changer les privilèges"
msgstr "Ajuster les privilèges"
#: libraries/operations.lib.php:113
#, php-format
@ -9872,10 +9868,10 @@ msgid "Table %s has been moved to %s. Privileges have been adjusted."
msgstr "La table %s a été déplacée vers %s. Les privilèges ont été ajustés."
#: libraries/operations.lib.php:1962
#, fuzzy, php-format
#, php-format
#| msgid "Table %s has been copied to %s. Privileges have been realigned."
msgid "Table %s has been copied to %s. Privileges have been adjusted."
msgstr "La table %s a été copiée vers %s. Les privilèges ont été réajustés."
msgstr "La table %s a été copiée vers %s. Les privilèges ont été ajustés."
#: libraries/operations.lib.php:1969
#, php-format
@ -11613,10 +11609,10 @@ msgid "Sorry, we failed to restore the dropped routine."
msgstr "Désolé, il a été impossible de restaurer la procédure."
#: libraries/rte/rte_routines.lib.php:382
#, fuzzy, php-format
#, php-format
#| msgid "Routine %1$s has been modified. Privileges have been realigned."
msgid "Routine %1$s has been modified. Privileges have been adjusted."
msgstr "La procédure %1$s a été modifiée. Les privilèges ont été réajustés."
msgstr "La procédure %1$s a été modifiée. Les privilèges ont été ajustés."
#: libraries/rte/rte_routines.lib.php:387
#, php-format

17
po/ro.po
View File

@ -4,14 +4,14 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2015-05-27 08:08-0400\n"
"PO-Revision-Date: 2015-04-07 21:04+0200\n"
"Last-Translator: Alecsandru Prună <alecs.pruna@outlook.com>\n"
"Language-Team: Romanian <https://hosted.weblate.org/projects/phpmyadmin/"
"master/ro/>\n"
"PO-Revision-Date: 2015-05-29 12:40+0200\n"
"Last-Translator: Costel Cocerhan <costa1988sv@gmail.com>\n"
"Language-Team: Romanian "
"<https://hosted.weblate.org/projects/phpmyadmin/master/ro/>\n"
"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
"20)) ? 1 : 2;\n"
"X-Generator: Weblate 2.3-dev\n"
@ -696,7 +696,7 @@ msgid "Import has been successfully finished, %d queries executed."
msgstr "Importul s-a terminat cu succes, %d interogări executate."
#: import.php:706
#, fuzzy, php-format
#, php-format
#| msgid ""
#| "Script timeout passed, if you want to finish import, please resubmit same "
#| "file and import will resume."
@ -704,7 +704,7 @@ msgid ""
"Script timeout passed, if you want to finish import, please %sresubmit the "
"same file%s and import will resume."
msgstr ""
"Durata maximă de execuție a scriptului a fost depășită. Dacă doriți să "
"Durata maximă de execuție a scriptului a fost depășită, dacă doriți să "
"terminați importul, retrimiteți același fișier și importul va continua."
#: import.php:716
@ -806,10 +806,9 @@ msgid "PHP extension:"
msgstr "Extensie PHP:"
#: index.php:345
#, fuzzy
#| msgid "PHP Version"
msgid "PHP version:"
msgstr "Versiune PHP"
msgstr "Versiune PHP:"
#: index.php:356
msgid "Show PHP information"

2
test/libraries/PMA_Tracker_test.php
View File

@ -552,7 +552,7 @@ class PMA_Tracker_Test extends PHPUnit_Framework_TestCase
$GLOBALS['dbi'] = $dbi;
$this->assertEquals(
'executed_1',
true,
PMA_Tracker::changeTrackingData(
'pma_db',
'pma_table',