| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -3283,14 +3283,14 @@ |
| 3284 | 3284 | ), |
| 3285 | 3285 | 'bitrateunits' => array( |
| 3286 | 3286 | 'bitrate-bits', |
| 3287 | | - 'bitrate-kibibits', |
| 3288 | | - 'bitrate-mebibits', |
| 3289 | | - 'bitrate-gibibits', |
| 3290 | | - 'bitrate-tebibits', |
| 3291 | | - 'bitrate-pebibits', |
| 3292 | | - 'bitrate-exbibits', |
| 3293 | | - 'bitrate-zebibits', |
| 3294 | | - 'bitrate-yobibits', |
| | 3287 | + 'bitrate-kilobits', |
| | 3288 | + 'bitrate-megabits', |
| | 3289 | + 'bitrate-gigabits', |
| | 3290 | + 'bitrate-terabits', |
| | 3291 | + 'bitrate-petabits', |
| | 3292 | + 'bitrate-exabits', |
| | 3293 | + 'bitrate-zetabits', |
| | 3294 | + 'bitrate-yottabits', |
| 3295 | 3295 | ), |
| 3296 | 3296 | 'livepreview' => array( |
| 3297 | 3297 | 'livepreview-loading', |
| Index: trunk/phase3/maintenance/language/messageTypes.inc |
| — | — | @@ -328,14 +328,14 @@ |
| 329 | 329 | 'size-zetabytes', |
| 330 | 330 | 'size-yottabytes', |
| 331 | 331 | 'bitrate-bits', |
| 332 | | - 'bitrate-kibibits', |
| 333 | | - 'bitrate-mebibits', |
| 334 | | - 'bitrate-gibibits', |
| 335 | | - 'bitrate-tebibits', |
| 336 | | - 'bitrate-pebibits', |
| 337 | | - 'bitrate-exbibits', |
| 338 | | - 'bitrate-zebibits', |
| 339 | | - 'bitrate-yobibits', |
| | 332 | + 'bitrate-kilobits', |
| | 333 | + 'bitrate-megabits', |
| | 334 | + 'bitrate-gigabits', |
| | 335 | + 'bitrate-terabits', |
| | 336 | + 'bitrate-petabits', |
| | 337 | + 'bitrate-exabits', |
| | 338 | + 'bitrate-zetabits', |
| | 339 | + 'bitrate-yottabits', |
| 340 | 340 | 'iranian-calendar-m1', |
| 341 | 341 | 'iranian-calendar-m2', |
| 342 | 342 | 'iranian-calendar-m3', |
| Index: trunk/phase3/languages/messages/MessagesQqq.php |
| — | — | @@ -4123,22 +4123,22 @@ |
| 4124 | 4124 | # Bitrate units |
| 4125 | 4125 | 'bitrate-bits' => '{{optional}} |
| 4126 | 4126 | Bitrate (of a file, typically) in bits.', |
| 4127 | | -'bitrate-kibibits' => '{{optional}} |
| 4128 | | -Bitrate (of a file, typically) in kibibits (1 kibibyte = 1000 bits).', |
| 4129 | | -'bitrate-mebibits' => '{{optional}} |
| 4130 | | -Bitrate (of a file, typically) in mebibits (1 mebibyte = 1000×1000 bits).', |
| 4131 | | -'bitrate-gibibits' => '{{optional}} |
| 4132 | | -Bitrate (of a file, typically) in gibibits (1 gibibyte = 1000×1000×1000 bits).', |
| 4133 | | -'bitrate-tebibits' => '{{optional}} |
| 4134 | | -Bitrate (of a file, typically) in tebibits (1 tebibits = 1000×1000×1000×1000 bits).', |
| 4135 | | -'bitrate-pebibits' => '{{optional}} |
| 4136 | | -Bitrate (of a file, typically) in pebibits (1 pebibits = 1000×1000×1000×1000×1000 bits).', |
| 4137 | | -'bitrate-exbibits' => '{{optional}} |
| 4138 | | -Bitrate (of a file, typically) in exbibits (1 exbibits = 1000×1000×1000×1000×1000×1000 bits).', |
| 4139 | | -'bitrate-zebibits' => '{{optional}} |
| 4140 | | -Bitrate (of a file, typically) in zebibits (1 zebibits = 1000×1000×1000×1000×1000×1000×1000 bits).', |
| 4141 | | -'bitrate-yobibits' => '{{optional}} |
| 4142 | | -Bitrate (of a file, typically) in yobibits (1 yobibits = 1000×1000×1000×1000×1000×1000×1000×1000 bits).', |
| | 4127 | +'bitrate-kilobits' => '{{optional}} |
| | 4128 | +Bitrate (of a file, typically) in kilobits (1 kilobit = 1000 bits).', |
| | 4129 | +'bitrate-megabits' => '{{optional}} |
| | 4130 | +Bitrate (of a file, typically) in megabits (1 megabits = 1000×1000 bits).', |
| | 4131 | +'bitrate-gigabits' => '{{optional}} |
| | 4132 | +Bitrate (of a file, typically) in gibibits (1 gigabits = 1000×1000×1000 bits).', |
| | 4133 | +'bitrate-terabits' => '{{optional}} |
| | 4134 | +Bitrate (of a file, typically) in terabits (1 terabits = 1000×1000×1000×1000 bits).', |
| | 4135 | +'bitrate-petabits' => '{{optional}} |
| | 4136 | +Bitrate (of a file, typically) in petabits (1 petabits = 1000×1000×1000×1000×1000 bits).', |
| | 4137 | +'bitrate-exabits' => '{{optional}} |
| | 4138 | +Bitrate (of a file, typically) in exabits (1 exabits = 1000×1000×1000×1000×1000×1000 bits).', |
| | 4139 | +'bitrate-zetabits' => '{{optional}} |
| | 4140 | +Bitrate (of a file, typically) in zetabits (1 zetabits = 1000×1000×1000×1000×1000×1000×1000 bits).', |
| | 4141 | +'bitrate-yottabits' => '{{optional}} |
| | 4142 | +Bitrate (of a file, typically) in yottabits (1 yottabits = 1000×1000×1000×1000×1000×1000×1000×1000 bits).', |
| 4143 | 4143 | |
| 4144 | 4144 | # Live preview |
| 4145 | 4145 | 'livepreview-loading' => '{{Identical|Loading}}', |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -4397,14 +4397,14 @@ |
| 4398 | 4398 | |
| 4399 | 4399 | # Bitrate units |
| 4400 | 4400 | 'bitrate-bits' => '$1bps', # only translate this message to other languages if you have to change it |
| 4401 | | -'bitrate-kibibits' => '$1kbps', # only translate this message to other languages if you have to change it |
| 4402 | | -'bitrate-mebibits' => '$1Mbps', # only translate this message to other languages if you have to change it |
| 4403 | | -'bitrate-gibibits' => '$1Gbps', # only translate this message to other languages if you have to change it |
| 4404 | | -'bitrate-tebibits' => '$1Tbps', # only translate this message to other languages if you have to change it |
| 4405 | | -'bitrate-pebibits' => '$1Pbps', # only translate this message to other languages if you have to change it |
| 4406 | | -'bitrate-exbibits' => '$1Ebps', # only translate this message to other languages if you have to change it |
| 4407 | | -'bitrate-zebibits' => '$1Zbps', # only translate this message to other languages if you have to change it |
| 4408 | | -'bitrate-yobibits' => '$1Ybps', # only translate this message to other languages if you have to change it |
| | 4401 | +'bitrate-kilobits' => '$1kbps', # only translate this message to other languages if you have to change it |
| | 4402 | +'bitrate-megabits' => '$1Mbps', # only translate this message to other languages if you have to change it |
| | 4403 | +'bitrate-gigabits' => '$1Gbps', # only translate this message to other languages if you have to change it |
| | 4404 | +'bitrate-terabits' => '$1Tbps', # only translate this message to other languages if you have to change it |
| | 4405 | +'bitrate-petabits' => '$1Pbps', # only translate this message to other languages if you have to change it |
| | 4406 | +'bitrate-exabits' => '$1Ebps', # only translate this message to other languages if you have to change it |
| | 4407 | +'bitrate-zetabits' => '$1Zbps', # only translate this message to other languages if you have to change it |
| | 4408 | +'bitrate-yottabits' => '$1Ybps', # only translate this message to other languages if you have to change it |
| 4409 | 4409 | |
| 4410 | 4410 | # Live preview |
| 4411 | 4411 | 'livepreview-loading' => 'Loading...', |
| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -3813,7 +3813,7 @@ |
| 3814 | 3814 | * @return string |
| 3815 | 3815 | */ |
| 3816 | 3816 | function formatBitrate( $bps ) { |
| 3817 | | - $units = array( '', 'kibi', 'mebi', 'gibi', 'tebi', 'pebi', 'exbi', 'zebi', 'yobi' ); |
| | 3817 | + $units = array( '', 'kilo', 'mega', 'giga', 'tera', 'peta', 'exa', 'zeta', 'yotta' ); |
| 3818 | 3818 | if ( $bps <= 0 ) { |
| 3819 | 3819 | return $this->formatNum( $bps ) . $units[0]; |
| 3820 | 3820 | } |