From effbf865a95bc0e76257dbdc07ad18c990226809 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Sat, 31 Dec 2011 21:54:28 +0000 Subject: [PATCH] Fixup r107744, r107743 --- languages/Language.php | 2 +- languages/messages/MessagesEn.php | 16 +++++++------- languages/messages/MessagesQqq.php | 32 +++++++++++++-------------- maintenance/language/messageTypes.inc | 16 +++++++------- maintenance/language/messages.inc | 16 +++++++------- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/languages/Language.php b/languages/Language.php index 26d7d1fd09..b6a95c06e4 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -3813,7 +3813,7 @@ class Language { * @return string */ function formatBitrate( $bps ) { - $units = array( '', 'kibi', 'mebi', 'gibi', 'tebi', 'pebi', 'exbi', 'zebi', 'yobi' ); + $units = array( '', 'kilo', 'mega', 'giga', 'tera', 'peta', 'exa', 'zeta', 'yotta' ); if ( $bps <= 0 ) { return $this->formatNum( $bps ) . $units[0]; } diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 37485a1a93..6148d927a0 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -4397,14 +4397,14 @@ Please confirm that you really want to recreate this page.", # Bitrate units 'bitrate-bits' => '$1bps', # only translate this message to other languages if you have to change it -'bitrate-kibibits' => '$1kbps', # only translate this message to other languages if you have to change it -'bitrate-mebibits' => '$1Mbps', # only translate this message to other languages if you have to change it -'bitrate-gibibits' => '$1Gbps', # only translate this message to other languages if you have to change it -'bitrate-tebibits' => '$1Tbps', # only translate this message to other languages if you have to change it -'bitrate-pebibits' => '$1Pbps', # only translate this message to other languages if you have to change it -'bitrate-exbibits' => '$1Ebps', # only translate this message to other languages if you have to change it -'bitrate-zebibits' => '$1Zbps', # only translate this message to other languages if you have to change it -'bitrate-yobibits' => '$1Ybps', # only translate this message to other languages if you have to change it +'bitrate-kilobits' => '$1kbps', # only translate this message to other languages if you have to change it +'bitrate-megabits' => '$1Mbps', # only translate this message to other languages if you have to change it +'bitrate-gigabits' => '$1Gbps', # only translate this message to other languages if you have to change it +'bitrate-terabits' => '$1Tbps', # only translate this message to other languages if you have to change it +'bitrate-petabits' => '$1Pbps', # only translate this message to other languages if you have to change it +'bitrate-exabits' => '$1Ebps', # only translate this message to other languages if you have to change it +'bitrate-zetabits' => '$1Zbps', # only translate this message to other languages if you have to change it +'bitrate-yottabits' => '$1Ybps', # only translate this message to other languages if you have to change it # Live preview 'livepreview-loading' => 'Loading...', diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php index 5252fc565e..5b99d784d7 100644 --- a/languages/messages/MessagesQqq.php +++ b/languages/messages/MessagesQqq.php @@ -4123,22 +4123,22 @@ Size (of a file, typically) in yobibytes (1 yobibytes = 1024×1024×1024×1024× # Bitrate units 'bitrate-bits' => '{{optional}} Bitrate (of a file, typically) in bits.', -'bitrate-kibibits' => '{{optional}} -Bitrate (of a file, typically) in kibibits (1 kibibyte = 1000 bits).', -'bitrate-mebibits' => '{{optional}} -Bitrate (of a file, typically) in mebibits (1 mebibyte = 1000×1000 bits).', -'bitrate-gibibits' => '{{optional}} -Bitrate (of a file, typically) in gibibits (1 gibibyte = 1000×1000×1000 bits).', -'bitrate-tebibits' => '{{optional}} -Bitrate (of a file, typically) in tebibits (1 tebibits = 1000×1000×1000×1000 bits).', -'bitrate-pebibits' => '{{optional}} -Bitrate (of a file, typically) in pebibits (1 pebibits = 1000×1000×1000×1000×1000 bits).', -'bitrate-exbibits' => '{{optional}} -Bitrate (of a file, typically) in exbibits (1 exbibits = 1000×1000×1000×1000×1000×1000 bits).', -'bitrate-zebibits' => '{{optional}} -Bitrate (of a file, typically) in zebibits (1 zebibits = 1000×1000×1000×1000×1000×1000×1000 bits).', -'bitrate-yobibits' => '{{optional}} -Bitrate (of a file, typically) in yobibits (1 yobibits = 1000×1000×1000×1000×1000×1000×1000×1000 bits).', +'bitrate-kilobits' => '{{optional}} +Bitrate (of a file, typically) in kilobits (1 kilobit = 1000 bits).', +'bitrate-megabits' => '{{optional}} +Bitrate (of a file, typically) in megabits (1 megabits = 1000×1000 bits).', +'bitrate-gigabits' => '{{optional}} +Bitrate (of a file, typically) in gibibits (1 gigabits = 1000×1000×1000 bits).', +'bitrate-terabits' => '{{optional}} +Bitrate (of a file, typically) in terabits (1 terabits = 1000×1000×1000×1000 bits).', +'bitrate-petabits' => '{{optional}} +Bitrate (of a file, typically) in petabits (1 petabits = 1000×1000×1000×1000×1000 bits).', +'bitrate-exabits' => '{{optional}} +Bitrate (of a file, typically) in exabits (1 exabits = 1000×1000×1000×1000×1000×1000 bits).', +'bitrate-zetabits' => '{{optional}} +Bitrate (of a file, typically) in zetabits (1 zetabits = 1000×1000×1000×1000×1000×1000×1000 bits).', +'bitrate-yottabits' => '{{optional}} +Bitrate (of a file, typically) in yottabits (1 yottabits = 1000×1000×1000×1000×1000×1000×1000×1000 bits).', # Live preview 'livepreview-loading' => '{{Identical|Loading}}', diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc index 19d16a8b3d..2f8404ed85 100644 --- a/maintenance/language/messageTypes.inc +++ b/maintenance/language/messageTypes.inc @@ -328,14 +328,14 @@ $wgOptionalMessages = array( 'size-zetabytes', 'size-yottabytes', 'bitrate-bits', - 'bitrate-kibibits', - 'bitrate-mebibits', - 'bitrate-gibibits', - 'bitrate-tebibits', - 'bitrate-pebibits', - 'bitrate-exbibits', - 'bitrate-zebibits', - 'bitrate-yobibits', + 'bitrate-kilobits', + 'bitrate-megabits', + 'bitrate-gigabits', + 'bitrate-terabits', + 'bitrate-petabits', + 'bitrate-exabits', + 'bitrate-zetabits', + 'bitrate-yottabits', 'iranian-calendar-m1', 'iranian-calendar-m2', 'iranian-calendar-m3', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 2d7c84fb5b..3fbf447b5c 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -3283,14 +3283,14 @@ $wgMessageStructure = array( ), 'bitrateunits' => array( 'bitrate-bits', - 'bitrate-kibibits', - 'bitrate-mebibits', - 'bitrate-gibibits', - 'bitrate-tebibits', - 'bitrate-pebibits', - 'bitrate-exbibits', - 'bitrate-zebibits', - 'bitrate-yobibits', + 'bitrate-kilobits', + 'bitrate-megabits', + 'bitrate-gigabits', + 'bitrate-terabits', + 'bitrate-petabits', + 'bitrate-exabits', + 'bitrate-zetabits', + 'bitrate-yottabits', ), 'livepreview' => array( 'livepreview-loading', -- 2.20.1