Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-04-20 11:43:26 +02:00
commit 38ad7ea16b

View File

@ -108,15 +108,15 @@ class PMA_Transformation_Test extends PHPUnit_Framework_TestCase
3 => 'Image/JPEG: Link',
4 => 'Image/PNG: Inline',
5 => 'Text/Octetstream: Sql',
6 => 'Text/Plain: Bool2text',
7 => 'Text/Plain: Dateformat',
8 => 'Text/Plain: External',
9 => 'Text/Plain: Formatted',
10 => 'Text/Plain: Imagelink',
11 => 'Text/Plain: Json',
12 => 'Text/Plain: Sql',
13 => 'Text/Plain: Xml',
14 => 'Text/Plain: BinaryToIP',
6 => 'Text/Plain: BinaryToIP',
7 => 'Text/Plain: Bool2text',
8 => 'Text/Plain: Dateformat',
9 => 'Text/Plain: External',
10 => 'Text/Plain: Formatted',
11 => 'Text/Plain: Imagelink',
12 => 'Text/Plain: Json',
13 => 'Text/Plain: Sql',
14 => 'Text/Plain: Xml',
15 => 'Text/Plain: Link',
16 => 'Text/Plain: Longtoipv4',
17 => 'Text/Plain: Preappend',