Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Isaac Bennetch 2013-08-24 11:52:19 -04:00
commit 3ee5f854fa

View File

@ -6,16 +6,16 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2013-08-18 06:16-0400\n"
"PO-Revision-Date: 2013-05-31 14:26+0200\n"
"Last-Translator: Robert Readman <robert_readman@hotmail.com>\n"
"Language-Team: English (United Kingdom) <http://l10n.cihar.com/projects/"
"phpmyadmin/master/en_GB/>\n"
"PO-Revision-Date: 2013-08-24 15:18+0200\n"
"Last-Translator: Patrick V <patrik_13@hotmail.com>\n"
"Language-Team: English (United Kingdom) "
"<http://l10n.cihar.com/projects/phpmyadmin/master/en_GB/>\n"
"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 1.6-dev\n"
"X-Generator: Weblate 1.7-dev\n"
#: browse_foreigners.php:50 browse_foreigners.php:70 js/messages.php:349
#: libraries/DisplayResults.class.php:805
@ -1923,7 +1923,7 @@ msgid ""
"edit, checkbox, Edit, Copy and Delete links may not work after saving."
msgstr ""
"This table does not contain a unique column. Features related to the grid "
"edit, tick-box, Edit, Copy and Delete links may not work after saving."
"edit, checkbox, Edit, Copy and Delete links may not work after saving."
#: js/messages.php:355
msgid "You can also edit most values<br />by double-clicking directly on them."